summaryrefslogtreecommitdiff
path: root/t/t4018
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-04-22 13:43:00 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-04-22 13:43:00 -0700
commitd6d561db1c0a14e8b89149694c0c662096c5fc9d (patch)
treed0180fa78b9b0c5d4c03e843686cdffcac8647e2 /t/t4018
parentMerge branch 'en/rebase-no-keep-empty' (diff)
parentrebase --merge: optionally skip upstreamed commits (diff)
downloadtgif-d6d561db1c0a14e8b89149694c0c662096c5fc9d.tar.xz
Merge branch 'jt/rebase-allow-duplicate'
Allow "git rebase" to reapply all local commits, even if the may be already in the upstream, without checking first. * jt/rebase-allow-duplicate: rebase --merge: optionally skip upstreamed commits
Diffstat (limited to 't/t4018')
0 files changed, 0 insertions, 0 deletions