Short Answer If it says Patch failed at 0001 commit message for F Then run $ head -1 .git/rebase-apply/0001 From ad1c7739c1152502229e3f2ab759ec5323988326 Mon Sep 17 00:00:00 2001 To get the SHA ad1c77 of the failing commit, and then use git show ad1c77 to have a look at it. Long Answer Let’s start with this tree: A—B—C—D … Read more
git rebase –committer-date-is-author-date –preserve-merges –onto A* A C git rebase –committer-date-is-author-date –preserve-merges –onto A* A B This should keep the common commits having the same sha1 and any merges preserved. Preserve merges is not required in this case, but will become an issue with a less trivial history. To do this for all branches that … Read more
Let’s start from the beginning. Here’s a diagram of your original state: A-B-C (master, origin/master) \ D-E-F-G-H-I (next, origin/next) When you checked out next and rebased next onto origin/master, it created 6 new commits after the two that are already on origin/master. These new commits have “master commit #2” (C in my diagram) as their … Read more
Do git rebase -i <sha before the branches diverged> this will allow you to remove the merge commit and the log will be one single line as you wanted. You can also delete any commits that you do not want any more. The reason that your rebase wasn’t working was that you weren’t going back … Read more
First fetch the new master from the upstream repository, then rebase your work branch on that: git fetch origin # Updates origin/master git rebase origin/master # Rebases current branch onto origin/master Update: Please see Paul Draper’s answer for a more concise way to do the same – recent Git versions provide a simpler way to … Read more
Required reading is Problems with rewriting history in the Git User’s Manual. If I rewrite history (and everything compiles/works in all affected branches), will my co-workers need to do any special commands (i.e. will they “know that I have done it” if I did it well?)? They will know, and Git will tell them in … Read more
Update July 2012 (git 1.7.12+) You now can rebase all commits up to root, and select the second commit Y to be squashed with the first X. git rebase -i –root master pick sha1 X squash sha1 Y pick sha1 Z git rebase [-i] –root $tip This command can now be used to rewrite all … Read more
Careful: git reset –hard WILL DELETE YOUR WORKING DIRECTORY CHANGES. Be sure to stash any local changes you want to keep before running this command. Assuming you are sitting on that commit, then this command will wack it… git reset –hard HEAD~1 The HEAD~1 means the commit before head. Or, you could look at the … Read more
There are two options here. One is to do an interactive rebase and edit the merge commit, redo the merge manually and continue the rebase. Another is to use the –rebase-merges option on git rebase, which is described as follows from the manual: By default, a rebase will simply drop merge commits from the todo … Read more
I’m fairly sure that there isn’t a way to automatically do this. Remember that “git rebase master” can also drop you back to the shell needing you to resolve merge conflicts, so if you want to write a script to automate all this you need to take that into account. You can fairly easily track … Read more