summaryrefslogtreecommitdiff
path: root/t/t4018/golang-long-func
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-10-12 13:51:39 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-10-12 13:51:39 -0700
commit3fb1d4da5e7053b54a7e82543fba679f64f72b9d (patch)
tree7d6024ba8fd6a209a165487bb0cbf1e9225d3601 /t/t4018/golang-long-func
parentMerge branch 'pw/rebase-skip-final-fix' into maint (diff)
parentrebase -r: fix merge -c with a merge strategy (diff)
downloadtgif-3fb1d4da5e7053b54a7e82543fba679f64f72b9d.tar.xz
Merge branch 'pw/rebase-r-fixes' into maint
Various bugs in "git rebase -r" have been fixed. * pw/rebase-r-fixes: rebase -r: fix merge -c with a merge strategy rebase -r: don't write .git/MERGE_MSG when fast-forwarding rebase -i: add another reword test rebase -r: make 'merge -c' behave like reword
Diffstat (limited to 't/t4018/golang-long-func')
0 files changed, 0 insertions, 0 deletions