diff options
author | Jeff King <peff@peff.net> | 2008-08-24 22:10:29 -0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-08-26 17:08:13 -0700 |
commit | 68daa64df2363f848d818dda9fc414511d9330da (patch) | |
tree | 8c6356e7b8df411c3ef4cfeb9a4181deef25b255 /grep.h | |
parent | 27a6ed492b3962d8214a196e57e8969ff9772249 (diff) | |
download | git-68daa64df2363f848d818dda9fc414511d9330da.tar.gz |
format-patch: use default diff format even with patch options
Previously, running "git format-patch -U5" would cause the
low-level diff machinery to change the diff output format
from "not specified" to "patch". This meant that
format-patch thought we explicitly specified a diff output
format, and would not use the default format. The resulting
message lacked both the diffstat and the summary, as well as
the separating "---".
Now format-patch explicitly checks for this condition and
uses the default. That means that "git format-patch -p" will
now have the "-p" ignored.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'grep.h')
0 files changed, 0 insertions, 0 deletions