mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
Merge branch 'mm/log-format-raw-doc'
Clarify that "log --raw" and "log --format=raw" are unrelated concepts. * mm/log-format-raw-doc: Documentation/log: clarify sha1 non-abbreviation in log --raw Documentation/log: clarify what --raw means
This commit is contained in:
commit
abcbafedbf
|
@ -43,10 +43,19 @@ endif::git-format-patch[]
|
|||
|
||||
ifndef::git-format-patch[]
|
||||
--raw::
|
||||
Generate the raw format.
|
||||
ifndef::git-log[]
|
||||
Generate the diff in raw format.
|
||||
ifdef::git-diff-core[]
|
||||
This is the default.
|
||||
endif::git-diff-core[]
|
||||
endif::git-log[]
|
||||
ifdef::git-log[]
|
||||
For each commit, show a summary of changes using the raw diff
|
||||
format. See the "RAW OUTPUT FORMAT" section of
|
||||
linkgit:git-diff[1]. This is different from showing the log
|
||||
itself in raw format, which you can achieve with
|
||||
`--format=raw`.
|
||||
endif::git-log[]
|
||||
endif::git-format-patch[]
|
||||
|
||||
ifndef::git-format-patch[]
|
||||
|
|
|
@ -79,7 +79,10 @@ stored in the commit object. Notably, the SHA-1s are
|
|||
displayed in full, regardless of whether --abbrev or
|
||||
--no-abbrev are used, and 'parents' information show the
|
||||
true parent commits, without taking grafts or history
|
||||
simplification into account.
|
||||
simplification into account. Note that this format affects the way
|
||||
commits are displayed, but not the way the diff is shown e.g. with
|
||||
`git log --raw`. To get full object names in a raw diff format,
|
||||
use `--no-abbrev`.
|
||||
|
||||
* 'format:<string>'
|
||||
+
|
||||
|
|
Loading…
Reference in a new issue