]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7cc51cf 1af221e)
Merge branch 'mg/rebase-i-onto-reflog-in-full' into maint-1.7.11
authorJunio C Hamano <gitster@pobox.com>
Mon, 10 Sep 2012 22:26:03 +0000 (15:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Sep 2012 22:26:03 +0000 (15:26 -0700)
The reflog entries left by "git rebase" and "git rebase -i" were
inconsistent (the interactive one gave an abbreviated object name).

* mg/rebase-i-onto-reflog-in-full:
  rebase -i: use full onto sha1 in reflog

1  2 
git-rebase--interactive.sh patch | diff1 | diff2 | blob | history

diff --cc git-rebase--interactive.sh
Simple merge
Unnamed repository; edit this file 'description' to name the repository.