aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-difftool.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-12-16 12:58:59 -0800
committerJunio C Hamano <gitster@pobox.com>2010-12-16 12:58:59 -0800
commitcf7a64b54afe28ff61b362abc04399de383977e0 (patch)
tree66ef37300dfa1b75c13f43e15df15ac8392afebb /Documentation/git-difftool.txt
parent914584266c7675d3d0fa18e0eed05742327b22e5 (diff)
parentf611ddc774b58864b1f0b02962c524683a2f6c59 (diff)
downloadgit-cf7a64b54afe28ff61b362abc04399de383977e0.tar.gz
git-cf7a64b54afe28ff61b362abc04399de383977e0.tar.xz
Merge branch 'kb/diff-C-M-synonym'
* kb/diff-C-M-synonym: diff: use "find" instead of "detect" as prefix for long forms of -M and -C diff: add --detect-copies-harder as a synonym for --find-copies-harder
Diffstat (limited to 'Documentation/git-difftool.txt')
0 files changed, 0 insertions, 0 deletions