summaryrefslogtreecommitdiff
path: root/Documentation/howto/using-merge-subtree.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-04-11 13:08:08 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-04-11 13:11:55 -0700
commit059a500d25162370afef6a7afe8a4e61f40eb2f3 (patch)
tree060163d08c3afbb031b7f9dab54d9e2b7e67b4ea /Documentation/howto/using-merge-subtree.txt
parentMerge branch 'jc/maint-verify-objects-remove-pessimism' into maint-1.7.8 (diff)
downloadtgif-059a500d25162370afef6a7afe8a4e61f40eb2f3.tar.xz
blame: accept --need-minimal
Between v1.7.1 and v1.7.2, 582aa00bdffb switched the default "diff" invocation not to use XDF_NEED_MINIMAL, but this breaks "git blame" rather badly. Allow the command line option to ask for an extra careful matching. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/howto/using-merge-subtree.txt')
0 files changed, 0 insertions, 0 deletions