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 /Documentation/git-sh-setup.txt | |
parent | Merge branch 'es/rebase-i-respect-core-commentchar' into maint (diff) | |
parent | rebase --preserve-merges: ignore "merge.log" config (diff) | |
download | tgif-9a3a02b605ae58f5d61e48f213cf11bef3379739.tar.xz |
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 'Documentation/git-sh-setup.txt')
0 files changed, 0 insertions, 0 deletions