]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'dl/pretty-reference'
authorJunio C Hamano <gitster@pobox.com>
Tue, 10 Dec 2019 21:11:42 +0000 (13:11 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 10 Dec 2019 21:11:43 +0000 (13:11 -0800)
"git log" family learned "--pretty=reference" that gives the name
of a commit in the format that is often used to refer to it in log
messages.

* dl/pretty-reference:
  SubmittingPatches: use `--pretty=reference`
  pretty: implement 'reference' format
  pretty: add struct cmt_fmt_map::default_date_mode_type
  pretty: provide short date format
  t4205: cover `git log --reflog -z` blindspot
  pretty.c: inline initalize format_context
  revision: make get_revision_mark() return const pointer
  completion: complete `tformat:` pretty format
  SubmittingPatches: remove dq from commit reference
  pretty-formats.txt: use generic terms for hash
  SubmittingPatches: use generic terms for hash

1  2 
Documentation/SubmittingPatches
Documentation/pretty-formats.txt
Documentation/pretty-options.txt
Documentation/rev-list-options.txt
contrib/completion/git-completion.bash
pretty.c
revision.c
t/t4205-log-pretty-formats.sh

Simple merge
Simple merge
Simple merge
Simple merge
diff --cc pretty.c
Simple merge
diff --cc revision.c
Simple merge
Simple merge