diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-09-11 14:57:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-11 14:57:49 -0700 |
| commit | 6026f68652b6f220ce12c161fe8ac3e44a1b5b5a (patch) | |
| tree | 80c9ed85435b42a3552d20837864111a0ac36a75 /combine-diff.c | |
| parent | 2de0f39cd27d8ab8eae2e3430b81294f26252693 (diff) | |
| parent | 66713ef3b00933755cdeff1ae823dda7b5843640 (diff) | |
Merge branch 'sh/pull-rebase-preserve'
"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
Diffstat (limited to 'combine-diff.c')
0 files changed, 0 insertions, 0 deletions