From: Jari Aalto <jari.aalto@xxxxxxxxx> Signed-off-by: Jari Aalto <jari.aalto@xxxxxxxxx> --- Documentation/pretty-options.txt | 31 +++++++++++++++---------------- 1 files changed, 15 insertions(+), 16 deletions(-) diff --git a/Documentation/pretty-options.txt b/Documentation/pretty-options.txt index 50923e2..2295f9d 100644 --- a/Documentation/pretty-options.txt +++ b/Documentation/pretty-options.txt @@ -1,15 +1,3 @@ ---pretty[=<format>]:: ---format=<format>:: - - Pretty-print the contents of the commit logs in a given format, - where '<format>' can be one of 'oneline', 'short', 'medium', - 'full', 'fuller', 'email', 'raw' and 'format:<string>'. See - the "PRETTY FORMATS" section for some additional details for each - format. When omitted, the format defaults to 'medium'. -+ -Note: you can specify the default pretty format in the repository -configuration (see linkgit:git-config[1]). - --abbrev-commit:: Instead of showing the full 40-byte hexadecimal commit object name, show only a partial prefix. Non default number of @@ -19,10 +7,6 @@ configuration (see linkgit:git-config[1]). This should make "--pretty=oneline" a whole lot more readable for people using 80-column terminals. ---oneline:: - This is a shorthand for "--pretty=oneline --abbrev-commit" - used together. - --encoding[=<encoding>]:: The commit objects record the encoding used for the log message in their encoding header; this option can be used to tell the @@ -46,3 +30,18 @@ is taken to be in `refs/notes/` if it is not qualified. 'core.notesRef' and 'notes.displayRef' variables (or corresponding environment overrides). Enabled by default. See linkgit:git-config[1]. +--oneline:: + This is a shorthand for "--pretty=oneline --abbrev-commit" + used together. + +--pretty[=<format>]:: +--format=<format>:: + + Pretty-print the contents of the commit logs in a given format, + where '<format>' can be one of 'oneline', 'short', 'medium', + 'full', 'fuller', 'email', 'raw' and 'format:<string>'. See + the "PRETTY FORMATS" section for some additional details for each + format. When omitted, the format defaults to 'medium'. ++ +Note: you can specify the default pretty format in the repository +configuration (see linkgit:git-config[1]). -- 1.7.2.3 -- 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