summaryrefslogtreecommitdiff
path: root/Documentation/git-log.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-07-22 11:23:27 -0700
committerJunio C Hamano <gitster@pobox.com>2013-07-22 11:23:27 -0700
commite2ecd252b5e3c90c211075ba9d1017379782708b (patch)
tree1f8a76636533b3f22006fef018e3dc30fbbc3bf8 /Documentation/git-log.txt
parent8827a58cf0ac7bee4ac8d357236975ead9783df3 (diff)
parent4ba258b7e1020e8e3f321ca2df01e34cd71bee88 (diff)
downloadgit-e2ecd252b5e3c90c211075ba9d1017379782708b.tar.gz
Merge branch 'mm/diff-no-patch-synonym-to-s'
"git show -s" was less discoverable than it should be. * mm/diff-no-patch-synonym-to-s: Documentation/git-log.txt: capitalize section names Documentation: move description of -s, --no-patch to diff-options.txt Documentation/git-show.txt: include common diff options, like git-log.txt diff: allow --patch & cie to override -s/--no-patch diff: allow --no-patch as synonym for -s t4000-diff-format.sh: modernize style
Diffstat (limited to 'Documentation/git-log.txt')
-rw-r--r--Documentation/git-log.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 2ee6962a72..ac2694d04c 100644
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -97,7 +97,7 @@ include::rev-list-options.txt[]
include::pretty-formats.txt[]
-Common diff options
+COMMON DIFF OPTIONS
-------------------
:git-log: 1
@@ -105,7 +105,7 @@ include::diff-options.txt[]
include::diff-generate-patch.txt[]
-Examples
+EXAMPLES
--------
`git log --no-merges`::
@@ -161,12 +161,12 @@ Examples
`git log -3`::
Limits the number of commits to show to 3.
-Discussion
+DISCUSSION
----------
include::i18n.txt[]
-Configuration
+CONFIGURATION
-------------
See linkgit:git-config[1] for core variables and linkgit:git-diff[1]