commit bfeb36cd3f37112f2fe7c1e4f39fa5b55f62fe53 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Jan 16 09:27:40 2015 -0500 Little script I use when squashing branches. It squashes the branch without changing its base, so that you don't get any rebase conflicts. (unless your squash was wrong). --- scripts/git-resquash.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/git-resquash.sh b/scripts/git-resquash.sh new file mode 100755 index 0000000..f40f543 --- /dev/null +++ b/scripts/git-resquash.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +REV=`git log --reverse --format='%H' master..HEAD | head -1` + +git rebase -i --autosquash ${REV}^ +