aboutsummaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-31 12:01:06 -0700
committerJunio C Hamano <gitster@pobox.com>2011-05-31 12:01:06 -0700
commit398dbe536d5e94b7f7263fc4900b5e6f788f495a (patch)
treeaaedf855fe5cf0ffb4fb88c7b7eb22de6a81af0d /git-merge-octopus.sh
parent82ca09090ef0615732a53e2d07414382ca8d1fe4 (diff)
parent6086ff65dfcf48237bdac6c64a85bef5d34d5b4e (diff)
downloadgit-398dbe536d5e94b7f7263fc4900b5e6f788f495a.tar.gz
git-398dbe536d5e94b7f7263fc4900b5e6f788f495a.tar.xz
Merge branch 'vh/config-interactive-singlekey-doc' into maint
* vh/config-interactive-singlekey-doc: git-reset.txt: better docs for '--patch' git-checkout.txt: better docs for '--patch' git-stash.txt: better docs for '--patch' git-add.txt: document 'interactive.singlekey' config.txt: 'interactive.singlekey; is used by...
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions