projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 33b29fd 9869778)
Merge branch 'ph/rebase-preserve-all-merges' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 29 Jan 2013 19:18:31 +0000 (11:18 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 29 Jan 2013 19:18:31 +0000 (11:18 -0800)
commitda2987d4c3be50bb9d888d145ba42fe26c7045f3
treef1385e81d0123482445f5f59ae498b703f253215tree | snapshot
parent33b29fd12c04fb599ff3d2a3235bb187710a9080commit | diff
parent986977847e6fb46448fc9c567292ccd2a93d40b3commit | diff
Merge branch 'ph/rebase-preserve-all-merges' into maint

"git rebase --preserve-merges" lost empty merges in recent versions
of Git.

* 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