X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=Documentation%2Fgit-log.txt;h=dec379b3e2bd58c74dba61a2a5207a38e702278c;hb=5b67f9a02854799a4c7863503c96fd0ae9f883bb;hp=03f958029ad7a35ec29f111217cd76ba21de9b5e;hpb=69d65bc7a38bd01049d8baa5efef7331ab9c71d2;p=thirdparty%2Fgit.git

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 03f958029a..dec379b3e2 100644
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -29,12 +29,14 @@ OPTIONS
 	(works only for a single file).
 
 --no-decorate::
---decorate[=short|full|no]::
+--decorate[=short|full|auto|no]::
 	Print out the ref names of any commits that are shown. If 'short' is
 	specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and
 	'refs/remotes/' will not be printed. If 'full' is specified, the
-	full ref name (including prefix) will be printed. The default option
-	is 'short'.
+	full ref name (including prefix) will be printed. If 'auto' is
+	specified, then if the output is going to a terminal, the ref names
+	are shown as if 'short' were given, otherwise no ref names are
+	shown. The default option is 'short'.
 
 --source::
 	Print out the ref name given on the command line by which each