summaryrefslogtreecommitdiff
path: root/t/t9114-git-svn-dcommit-merge.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2007-12-11 23:46:30 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2007-12-12 10:59:22 -0800
commitf604652e05073aaef6d83e83b5d6499b55bb6dfd (patch)
treee435dad9c570157709c3966518058c21be4958c6 /t/t9114-git-svn-dcommit-merge.sh
parentDocumentation: minor grammar fix for "git apply" (diff)
downloadtgif-f604652e05073aaef6d83e83b5d6499b55bb6dfd.tar.xz
git-diff --numstat -z: make it machine readable
The "-z" format is all about machine parsability, but showing renamed paths as "common/{a => b}/suffix" makes it impossible. The scripts would never have successfully parsed "--numstat -z -M" in the old format. This fixes the output format in a (hopefully minimally) backward incompatible way. * The output without -z is not changed. This has given a good way for humans to view added and deleted lines separately, and showing the path in combined, shorter way would preserve readability. * The output with -z is unchanged for paths that do not involve renames. Existing scripts that do not pass -M/-C are not affected at all. * The output with -z for a renamed path is shown in a format that can easily be distinguished from an unrenamed path. This is based on Jakub Narebski's patch. Bugs and documentation typos are mine. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9114-git-svn-dcommit-merge.sh')
0 files changed, 0 insertions, 0 deletions