summaryrefslogtreecommitdiff
path: root/t/t3032-merge-recursive-options.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-12-12 21:49:53 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-12-12 21:49:53 -0800
commitb5c178143088350c49129acbedb864d70c666215 (patch)
tree0700cd77ab20d235cd94dab11280f7ac7e40c450 /t/t3032-merge-recursive-options.sh
parentMerge branch 'gb/web--browse' (diff)
parentgit-pull.txt: Mention branch.autosetuprebase (diff)
downloadtgif-b5c178143088350c49129acbedb864d70c666215.tar.xz
Merge branch 'ja/maint-pull-rebase-doc'
* ja/maint-pull-rebase-doc: git-pull.txt: Mention branch.autosetuprebase
Diffstat (limited to 't/t3032-merge-recursive-options.sh')
0 files changed, 0 insertions, 0 deletions