summaryrefslogtreecommitdiff
path: root/decorate.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-01-23 13:16:38 -0800
committerJunio C Hamano <gitster@pobox.com>2018-01-23 13:16:38 -0800
commit5550449812e26d97d4a70251c5027b1015351c91 (patch)
treeb7c31e21a8dc41fae75388fc972d2643fe17b798 /decorate.c
parent86d7fcc40acc077638d51d2bf5133d5a66c5d959 (diff)
parent30884c9afcd03aa7d9a0524fde3c96d2e29cf9a9 (diff)
downloadgit-5550449812e26d97d4a70251c5027b1015351c91.tar.gz
Merge branch 'ab/commit-m-with-fixup'
"git commit --fixup" did not allow "-m<message>" option to be used at the same time; allow it to annotate resulting commit with more text. * ab/commit-m-with-fixup: commit: add support for --fixup <commit> -m"<extra message>" commit doc: document that -c, -C, -F and --fixup with -m error
Diffstat (limited to 'decorate.c')
0 files changed, 0 insertions, 0 deletions