]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
"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

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

diff --cc git-rebase--interactive.sh
Simple merge
Unnamed repository; edit this file 'description' to name the repository.