I was trying to squash some old commits back together, that have already been pushed to master. I'm the only developer though so it's fine to force update the repository. I started with this:
% git log --oneline --decorate --graph --all * 4b2fec5 (HEAD -> master, tag: v6.2.5, origin/master, origin/HEAD) Version 6.2.5 - Fixed MegaMillions payout bug * b0ae8a9 (tag: v6.2.4) Version 6.2.4 - Handles large size text * f4763bd (tag: v6.2.3) 6.2.3 * 3f02a27 (tag: v6.2.1) Version 6.2.1 * 7703d55 (tag: v6.2.0) Updated revision * a2c6366 Removed legacy NSNotification stuff. * 1e3b359 Changes UITextFieldTextDidChange to use an onPost handler. * 35b910b Turns off the request for app store rating. * 5c20d46 Put the detail segue back in. * f90722d Got rid of stack view from MasterViewController * eb34f07 Removed unnecessary null coalesce operator. * c969126 Changed for Megamillions new payout structure. * 2a32838 Version 6.2.0 * efb33b0 Initial commit * 13a5b0e (tag: v6.0.1) 6.0.1 for app store * 45ab2ba Downloads new numbers after creating a new ticket now. * 2d60f30 Cancel button didn't have an exit segue on the master. * 2185112 Changed to static size text for loser * 872f408 Initial Commit And now I want to squish everything between the v6.2.0 tag and the Version 6.2.0 commit into a single commit, so I did a git rebase -i efb33b0 which said it was successful. But now I'm left with the following:
% git log --oneline --decorate --graph --all * 0fb2623 (HEAD -> master) Version 6.2.5 - Fixed MegaMillions payout bug * 81d3553 Version 6.2.4 - Handles large size text * d7d7578 6.2.3 * eae8973 Version 6.2.1 * ded0fe9 Version 6.2.0 | * 4b2fec5 (tag: v6.2.5, origin/master, origin/HEAD) Version 6.2.5 - Fixed MegaMillions payout bug | * b0ae8a9 (tag: v6.2.4) Version 6.2.4 - Handles large size text | * f4763bd (tag: v6.2.3) 6.2.3 | * 3f02a27 (tag: v6.2.1) Version 6.2.1 | * 7703d55 (tag: v6.2.0) Updated revision | * a2c6366 Removed legacy NSNotification stuff. | * 1e3b359 Changes UITextFieldTextDidChange to use an onPost handler. | * 35b910b Turns off the request for app store rating. | * 5c20d46 Put the detail segue back in. | * f90722d Got rid of stack view from MasterViewController | * eb34f07 Removed unnecessary null coalesce operator. | * c969126 Changed for Megamillions new payout structure. | * 2a32838 Version 6.2.0 |/ * efb33b0 Initial commit * 13a5b0e (tag: v6.0.1) 6.0.1 for app store * 45ab2ba Downloads new numbers after creating a new ticket now. * 2d60f30 Cancel button didn't have an exit segue on the master. * 2185112 Changed to static size text for loser * 872f408 Initial Commit How do I get rid of that extra "branch" that's in there? Basically it looks like that entire branch to the right just needs to go away, so that it only follows the main path...and somehow change the tags over too.
git log --oneline.Do you see your commits squashed ?