One real fix since v3: there was an incorrect file name in a test
(noticed by Jonathan). Now, all actual outputs are called "actual".
Other than that: extra tests, and style fixes in commit messages.
Matthieu Moy (6):
t4000-diff-format.sh: modernize style
diff: allow --no-patch as synonym for -s
diff: allow --patch & cie to override -s/--no-patch
Documentation/git-show.txt: include common diff options, like
git-log.txt
Documentation: move description of -s, --no-patch to diff-options.txt
Documentation/git-log.txt: capitalize section names
Documentation/diff-options.txt | 5 ++++
Documentation/git-log.txt | 8 +++----
Documentation/git-show.txt | 9 +++++++
Documentation/rev-list-options.txt | 3 ---
diff.c | 30 ++++++++++++++----------
t/t4000-diff-format.sh | 48 +++++++++++++++++++++++++++++++-------
6 files changed, 75 insertions(+), 28 deletions(-)
--
1.8.3.1.495.g13f33cf.dirty
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html