summaryrefslogtreecommitdiff
path: root/t/t3507-cherry-pick-conflict.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-05-13 14:50:34 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-05-13 14:50:34 (GMT)
commit7ba06bc3d026cee54437db5cfddfffe7b4d7a187 (patch)
treeeec56549e6d2e5593981ec2540b77f4a46e80309 /t/t3507-cherry-pick-conflict.sh
parent6cfa633565cc16f77d6e6d56fa608680828105a1 (diff)
parent460bc3ce7386582b3259f8e3a2c1ace443ddb1ae (diff)
downloadgit-7ba06bc3d026cee54437db5cfddfffe7b4d7a187.zip
git-7ba06bc3d026cee54437db5cfddfffe7b4d7a187.tar.gz
git-7ba06bc3d026cee54437db5cfddfffe7b4d7a187.tar.bz2
Merge branch 'pw/rebase-i-internal'
The internal implementation of "git rebase -i" has been updated to avoid forking a separate "rebase--interactive" process. * pw/rebase-i-internal: rebase -i: run without forking rebase--interactive rebase: use a common action enum rebase -i: use struct rebase_options in do_interactive_rebase() rebase -i: use struct rebase_options to parse args rebase -i: use struct object_id for squash_onto rebase -i: use struct commit when parsing options rebase -i: remove duplication rebase -i: combine rebase--interactive.c with rebase.c rebase: use OPT_RERERE_AUTOUPDATE() rebase: rename write_basic_state() rebase: don't translate trace strings sequencer: always discard index after checkout
Diffstat (limited to 't/t3507-cherry-pick-conflict.sh')
0 files changed, 0 insertions, 0 deletions