diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-06-01 12:45:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-01 12:45:18 -0700 |
| commit | abcbafedbfbd5994ad604bab141c0ba18f5a19df (patch) | |
| tree | 49b3dda778d5df9f024013c8480f9b4ba0f3db50 /builtin/merge.c | |
| parent | Merge branch 'dt/cat-file-follow-symlinks' (diff) | |
| parent | Documentation/log: clarify sha1 non-abbreviation in log --raw (diff) | |
| download | tgif-abcbafedbfbd5994ad604bab141c0ba18f5a19df.tar.xz | |
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
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions