diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-10-17 15:45:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-10-17 15:45:45 -0700 |
| commit | 9a3a02b605ae58f5d61e48f213cf11bef3379739 (patch) | |
| tree | 2fa76b68458b835b031d2511049cfee3afa905cf /commit.h | |
| parent | 6f89c2714a557ad3630ed005f4680193a638ce3f (diff) | |
| parent | a9f739c111898ed879bc077fb3a2f71b9766bba7 (diff) | |
| download | git-9a3a02b605ae58f5d61e48f213cf11bef3379739.tar.gz | |
Merge branch 'rt/rebase-p-no-merge-summary' into maint
* rt/rebase-p-no-merge-summary:
rebase --preserve-merges: ignore "merge.log" config
Diffstat (limited to 'commit.h')
0 files changed, 0 insertions, 0 deletions