diff options
| author | Chris Riddoch <chris@syntacticsugar.org> | 2006-11-21 16:49:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-11-22 16:06:32 -0800 |
| commit | 5d1faf8791fa85ba9be2282900d4f704c7790648 (patch) | |
| tree | 2e09cb0097e66268095b98ca40bb59cbca8fa3e1 /Documentation/git-show.txt | |
| parent | 594270635732d6320d6e6d7fa127679ae90ef5b1 (diff) | |
| download | git-5d1faf8791fa85ba9be2282900d4f704c7790648.tar.gz | |
Move --pretty options into Documentation/pretty-formats.txt
Asciidoc-include it into the manuals for programs that use the
--pretty command-line option, for consistency among the docs.
This describes all the pretty-formats currently listed in the cmit_fmt
enum in commit.h, and also briefly describes the presence and format
of the 'Merge: ' line in some pretty formats.
There's a hedge that limiting your view of history can affect what
goes in the Merge: line, and that --abbrev/--no-abbrev do nothing to
the 'raw' format.
Signed-off-by: Chris Riddoch <chris@syntacticsugar.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-show.txt')
| -rw-r--r-- | Documentation/git-show.txt | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Documentation/git-show.txt b/Documentation/git-show.txt index 2b4df3f96f..4c880a8717 100644 --- a/Documentation/git-show.txt +++ b/Documentation/git-show.txt @@ -26,10 +26,7 @@ OPTIONS <commitid>:: ID of the commit to show. ---pretty=<format>:: - Controls the output format for the commit logs. - <format> can be one of 'raw', 'medium', 'short', 'full', - and 'oneline'. +include::pretty-formats.txt[] Author ------ |