incorrect beahavior of squash in rebase/cherry pick
By Borisov.Ger... on June 19, 2012 11:01 (imported from Google Code)
I try to do rebase as described at http://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits
What steps will reproduce the problem?
- Create a new branch, and commit to it 3 times, with messages "one", "two" and "three"
- Fetch origin/master and try rebase your changes to master
- In "Rebase" window set command "squash" for "two" and "three" commits, commit "one" stay with "pick".
- Execute rebase.
What is the expected output? What do you see instead?
As described in book, I will take 1 commit that include combination of 3 commits, but I have 2 commits, first is copy of "one", and second is combination of "two" and "three".
What version of the product are you using? On what operating system?
TortoiseGit 1.7.8.0, msysgit 1.7.9, Win2003 x32
Please provide any additional information below.
Console git work correctly.
To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information