projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 68434e2 9869778)
Merge branch 'ph/rebase-preserve-all-merges'
authorJunio C Hamano <gitster@pobox.com>
Tue, 22 Jan 2013 04:15:15 +0000 (20:15 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 22 Jan 2013 04:15:15 +0000 (20:15 -0800)
commit51c6de2bab06562d0e69dcfd48f04a3b28a878b1
tree71df21800244a482a0ad6246e85d98fb90e4f7batree | snapshot
parent68434e287988f697a6565cb4666598bd8033f46fcommit | diff
parent986977847e6fb46448fc9c567292ccd2a93d40b3commit | diff
Merge branch 'ph/rebase-preserve-all-merges'

An earlier change to add --keep-empty option broke "git rebase
--preserve-merges" and lost merge commits that end up being the
same as its parent.

* ph/rebase-preserve-all-merges:
  rebase --preserve-merges: keep all merge commits including empty ones
git-rebase--interactive.sh diff1 | diff2 | blob | history
Git—the stupid content tracker