summaryrefslogtreecommitdiff
path: root/CODE_OF_CONDUCT.md
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-10-12 13:51:38 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-10-12 13:51:38 -0700
commit444b8548b1bb8cec8fc885455eba2e0efcca780f (patch)
tree5cabfec2e9a20c65fe3289218e8a7b005f749889 /CODE_OF_CONDUCT.md
parentMerge branch 'jk/range-diff-fixes' into maint (diff)
parentcommit: restore --edit when combined with --fixup (diff)
downloadtgif-444b8548b1bb8cec8fc885455eba2e0efcca780f.tar.xz
Merge branch 'jk/commit-edit-fixup-fix' into maint
"git commit --fixup" now works with "--edit" again, after it was broken in v2.32. * jk/commit-edit-fixup-fix: commit: restore --edit when combined with --fixup
Diffstat (limited to 'CODE_OF_CONDUCT.md')
0 files changed, 0 insertions, 0 deletions