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

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.