diff options
| author | Chris Riddoch <chris@syntacticsugar.org> | 2006-11-22 02:49:15 +0300 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-11-23 03:06:32 +0300 |
| commit | 5d1faf8791fa85ba9be2282900d4f704c7790648 (patch) | |
| tree | 2e09cb0097e66268095b98ca40bb59cbca8fa3e1 /Documentation/git-diff-tree.txt | |
| parent | 594270635732d6320d6e6d7fa127679ae90ef5b1 (diff) | |
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-diff-tree.txt')
| -rw-r--r-- | Documentation/git-diff-tree.txt | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt index f7e8ff2968..5d6e9dc751 100644 --- a/Documentation/git-diff-tree.txt +++ b/Documentation/git-diff-tree.txt @@ -73,10 +73,7 @@ separated with a single space are given. This flag causes "git-diff-tree --stdin" to also show the commit message before the differences. ---pretty[=(raw|medium|short)]:: - This is used to control "pretty printing" format of the - commit message. Without "=<style>", it defaults to - medium. +include::pretty-formats.txt[] --no-commit-id:: git-diff-tree outputs a line with the commit ID when |