summaryrefslogtreecommitdiff
path: root/t/helper
diff options
context:
space:
mode:
authorLibravatar Pratik Karki <predatoramigo@gmail.com>2018-08-08 20:51:16 +0545
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-09-06 11:55:58 -0700
commitf95736288a3a8d0168af3fc05dc4251edf0d0b47 (patch)
tree280d5684d592d90ebfa5f818041764ec8a7a2b34 /t/helper
parentbuiltin rebase: support `git rebase <upstream> <switch-to>` (diff)
downloadtgif-f95736288a3a8d0168af3fc05dc4251edf0d0b47.tar.xz
builtin rebase: support --continue
This commit adds the option `--continue` which is used to resume rebase after merge conflicts. The code tries to stay as close to the equivalent shell scripts found in `git-legacy-rebase.sh` as possible. When continuing a rebase, the state variables are read from state_dir. Some of the state variables are not actually stored there, such as `upstream`. The shell script version simply does not set them, but for consistency, we unset them in the builtin version. Signed-off-by: Pratik Karki <predatoramigo@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/helper')
0 files changed, 0 insertions, 0 deletions