tl;dr Even if you can include merge commits in a rebase, you can’t squash merge commits. Git will let you know by saying: Refusing to squash a merge: <SHA-1> What you can do in order to keep the changes made during the merge is to convert the merge commit into a normal commit. At that … Read more
You can do an interactive rebase, per the docs and this blog post. Start an interactive rebase: git rebase -i HEAD~n (where n is how far do you want to go back in history) Your default editor will open. At the top, a list of your latest n commits will be displayed, in reverse order. … Read more
The problem here is that git bisect is branch aware. When you tell it that “dependent” is good and “test” is bad, and one of the changes between there is a merge commit, it knows that in order to figure out where the problem was introduced, it’s going to have to look at commits a, … 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
Starting with git version 2.26 Here’s the shell command that prints the rebase progress: ( RMD=”$( git rev-parse –git-path ‘rebase-merge/’ )” && N=$( cat “${RMD}msgnum” ) && L=$( cat “${RMD}end” ) && echo “${N} / ${L}” ; ) Sample output will be like 4 / 7 You can modify the last echo command parameter to … Read more
You can probably use the exec option to achieve what you want. Use an exec command similar to git commit –amend -m “this is the new message” You can either use that directly, or if you need more sophistication put it in an external script called my_reword. #!/bin/sh git commit –amend -m “$1” Then add … Read more
Use interactive rebase: git rebase -i master An editor will open and you will have a list of commits like this: pick b8f7c25 Fix 1 pick 273b0bb Fix 2 pick 6aaea1b Fix 3 Just delete the commit you want to skip. It will be omitted while rebasing your branch onto master. P.S. If you cannot … Read more
Like Cupcake stated, you can’t retain the old signature from the unsquashed commits, but you can sign the new squashed commit if you rebase like this: git rebase –interactive –gpg-sign=myemail@example.com HEAD~4 Adding –gpg-sign=myemail@example.com as an argument will sign the final squashed commit.
Technically—and I claim this is a bit stupid of git, the pull script (it’s a shell script) should just do this for you—you have to run git pull –rebase=preserve rather than attempting to use git pull –rebase –preserve-merges. (Or, as I noted in a comment on Vlad Nikitin’s answer, you can set branch.name.rebase to preserve … Read more
You can run git rebase –abort to completely undo the rebase. Git will return you to your branch’s state as it was before git rebase was called. You can run git rebase –skip to completely skip the commit. That means that none of the changes introduced by the problematic commit will be included. It is … Read more