summaryrefslogtreecommitdiff
path: root/git-merge-one-file.sh
diff options
context:
space:
mode:
authorBjörn Gustavsson <bgustavsson@gmail.com>2009-11-22 19:43:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-11-22 20:08:00 (GMT)
commit64485b4aba98b39f2cf4528aed95b6ddca62f332 (patch)
treec7fff38d377f34d00cba6a20eed17e528c506624 /git-merge-one-file.sh
parent39add7a36feca434ba85267cb76e4fd69bcdc13a (diff)
downloadgit-64485b4aba98b39f2cf4528aed95b6ddca62f332.zip
git-64485b4aba98b39f2cf4528aed95b6ddca62f332.tar.gz
git-64485b4aba98b39f2cf4528aed95b6ddca62f332.tar.bz2
Clarify and correct -z
The description for -z is too vague and general for the apply, diff*, and log commands. Change the description of -z for 'git log' to note that commits will be separated by NULs. Change the description of -z for 'git diff*' and 'git apply' to note that it applies to the --numstat option, and for 'git diff*' also for --raw option. Also correct the description of the "munging" of pathanmes that takes place in the absence of -z for the 'git diff*' and 'git apply' commands, namely that apart from the characters mentioned, double quotes will also be escaped and that the pathname will be enclosed in double quotes if any characters are escaped. Signed-off-by: Björn Gustavsson <bgustavsson@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions