This makes rebase act a little more like merge when working on the
current branch. This is particularly useful for `git pull --rebase`
Signed-off-by: Brian Gernhardt <benji@xxxxxxxxxxxxxxxxxx>
---
I was trying to figure out why reviewing the new changes in git was so
hard using my `git log ORIG_HEAD..` alias. Turns out my ORIG_HEAD
hadn't been updated since Feburary, which is when I set
branch.master.rebase to true.
I think ORIG_HEAD should be set every time a pull changes HEAD, whether
by a merge or rebase. Making rebase act like merge seemed more elegant
than having git-pull set ORIG_HEAD iff using rebase.
git-rebase.sh | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/git-rebase.sh b/git-rebase.sh
index 9b13b83..8d54d9f 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -342,6 +342,7 @@ case "$#" in
branch_name=HEAD ;# detached
fi
branch=$(git rev-parse --verify "${branch_name}^0") || exit
+ echo "$branch" > "$GIT_DIR/ORIG_HEAD"
;;
esac
orig_head=$branch
--
1.5.5.1.242.g558e8
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
