diff options
author | Matthieu Moy <Matthieu.Moy@imag.fr> | 2013-07-16 10:05:37 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-07-17 17:50:56 -0700 |
commit | 71482d389d0b214d2cfc2adf788ba1011a7dcb18 (patch) | |
tree | eed10dcbed7a53968a322849650287642b3bf23d /t/t1200-tutorial.sh | |
parent | diff: allow --no-patch as synonym for -s (diff) | |
download | tgif-71482d389d0b214d2cfc2adf788ba1011a7dcb18.tar.xz |
diff: allow --patch & cie to override -s/--no-patch
All options that trigger a patch output now override --no-patch.
The case of --binary deserves extra attention: the name may suggest that
it turns a normal patch into a binary patch, but it actually already
enables patch output when normally disabled (e.g. "git log --binary"
displays a patch), hence it makes sense for "git show --no-patch
--binary" to display the binary patch.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t1200-tutorial.sh')
0 files changed, 0 insertions, 0 deletions