OSDN Git Service

(root) / git-core / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2de0f39 66713ef)
Merge branch 'sh/pull-rebase-preserve'
authorJunio C Hamano <gitster@pobox.com>
Wed, 11 Sep 2013 21:57:49 +0000 (14:57 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 Sep 2013 21:57:49 +0000 (14:57 -0700)
"git pull --rebase" always flattened the history; pull.rebase can
now be set to "preserve" to invoke "rebase --preserve-merges".

* sh/pull-rebase-preserve:
  pull: allow pull to preserve merges when rebasing

1  2 
Documentation/config.txt patch | diff1 | diff2 | blob | history

diff --cc Documentation/config.txt
Simple merge
Mirror of official git.git repository
About OSDN
Find Software
Develop Software
Help