summaryrefslogtreecommitdiff
path: root/t/t6037-merge-ours-theirs.sh
diff options
context:
space:
mode:
authorLibravatar Matthieu Moy <Matthieu.Moy@imag.fr>2015-05-18 19:55:57 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-05-18 13:42:52 -0700
commitd89df367f61e8da1ae05ef7054bab4343eb67cdf (patch)
tree5e1679750297927060ae0c77ed22fee59af4038c /t/t6037-merge-ours-theirs.sh
parentMerge branch 'maint-1.9' into maint-2.0 (diff)
downloadtgif-d89df367f61e8da1ae05ef7054bab4343eb67cdf.tar.xz
Documentation/log: clarify what --raw means
There are several "raw formats", and describing --raw as "Generate the raw format" in the documentation for git-log seems to imply that it generates the raw *log* format. Clarify the wording by saying "raw diff format" explicitly, and make a special-case for "git log": "git log --raw" does not just change the format, it shows something which is not shown by default. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6037-merge-ours-theirs.sh')
0 files changed, 0 insertions, 0 deletions