diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-01-23 13:16:38 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-01-23 13:16:38 -0800 |
| commit | 5550449812e26d97d4a70251c5027b1015351c91 (patch) | |
| tree | b7c31e21a8dc41fae75388fc972d2643fe17b798 /builtin/merge-ours.c | |
| parent | Merge branch 'cc/codespeed' (diff) | |
| parent | commit: add support for --fixup <commit> -m"<extra message>" (diff) | |
| download | tgif-5550449812e26d97d4a70251c5027b1015351c91.tar.xz | |
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 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions