summaryrefslogtreecommitdiff
path: root/parse-options.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-02-27 18:43:54 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-02-27 18:43:54 (GMT)
commitc1ab3b8a44149a8dfb8968a958b13ac9e8d9579a (patch)
treead13ad23ec4fdecbaaf7cb8a9c4e9729f2ec18cd /parse-options.h
parent12accdc023f2b62109860cb745bdd1827b2c22de (diff)
parent30884c9afcd03aa7d9a0524fde3c96d2e29cf9a9 (diff)
downloadgit-c1ab3b8a44149a8dfb8968a958b13ac9e8d9579a.zip
git-c1ab3b8a44149a8dfb8968a958b13ac9e8d9579a.tar.gz
git-c1ab3b8a44149a8dfb8968a958b13ac9e8d9579a.tar.bz2
Merge branch 'ab/commit-m-with-fixup' into maint
"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 'parse-options.h')
0 files changed, 0 insertions, 0 deletions