summaryrefslogtreecommitdiff
path: root/Documentation/git-difftool.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-05-31 12:01:06 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-05-31 12:01:06 -0700
commit398dbe536d5e94b7f7263fc4900b5e6f788f495a (patch)
treeaaedf855fe5cf0ffb4fb88c7b7eb22de6a81af0d /Documentation/git-difftool.txt
parentMerge branch 'ml/test-readme' into maint (diff)
parentgit-reset.txt: better docs for '--patch' (diff)
downloadtgif-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 'Documentation/git-difftool.txt')
0 files changed, 0 insertions, 0 deletions