projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 76f4f74 c192f9c)
Merge branch 'aw/maint-rebase-i-p-no-ff'
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 May 2011 17:50:00 +0000 (10:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 May 2011 17:50:00 +0000 (10:50 -0700)
commit9fdc1cc872308869d76665be55367eef48f05ff6
treec8d6a72151878f81e001775dbd383584f059b4cetree | snapshot
parent76f4f74a444cdb3d43950c099da60e5d1ad36305commit | diff
parentc192f9c865dbdae48c0400d717581d34cd315fb8commit | diff
Merge branch 'aw/maint-rebase-i-p-no-ff'

* aw/maint-rebase-i-p-no-ff:
  git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff

Conflicts:
git-rebase--interactive.sh
git-rebase--interactive.sh diff1 | diff2 | blob | history
Git—the stupid content tracker