git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6f89c27 a9f739c)
Merge branch 'rt/rebase-p-no-merge-summary' into maint
authorJunio C Hamano <redacted>
Thu, 17 Oct 2013 22:45:45 +0000 (15:45 -0700)
committerJunio C Hamano <redacted>
Thu, 17 Oct 2013 22:45:45 +0000 (15:45 -0700)
* rt/rebase-p-no-merge-summary:
  rebase --preserve-merges: ignore "merge.log" config

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

diff --cc git-rebase--interactive.sh
Simple merge
git clone https://git.99rst.org/PROJECT