| commit | 9fdc1cc872308869d76665be55367eef48f05ff6 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 6 May 2011 17:50:00 +0000 (6 10:50 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 6 May 2011 17:50:00 +0000 (6 10:50 -0700) | ||
| tree | c8d6a72151878f81e001775dbd383584f059b4ce | treesnapshot (tar.gz zip) |
| parent | 76f4f74a444cdb3d43950c099da60e5d1ad36305 | commitdiff |
| parent | c192f9c865dbdae48c0400d717581d34cd315fb8 | commitdiff |
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
* 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 | blobhistory |