summaryrefslogtreecommitdiff
path: root/Documentation/git-sh-setup.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-10-17 15:45:45 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-10-17 15:45:45 -0700
commit9a3a02b605ae58f5d61e48f213cf11bef3379739 (patch)
tree2fa76b68458b835b031d2511049cfee3afa905cf /Documentation/git-sh-setup.txt
parentMerge branch 'es/rebase-i-respect-core-commentchar' into maint (diff)
parentrebase --preserve-merges: ignore "merge.log" config (diff)
downloadtgif-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