| commit | f95736288a3a8d0168af3fc05dc4251edf0d0b47 | |
| author | Pratik Karki <predatoramigo@gmail.com> | |
| Wed, 8 Aug 2018 15:06:16 +0000 (8 20:51 +0545) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 6 Sep 2018 18:55:58 +0000 (6 11:55 -0700) | ||
| tree | 280d5684d592d90ebfa5f818041764ec8a7a2b34 | treesnapshot (tar.gz zip) |
| parent | e65123a71d0ca134f901e2340674a712e70ce023 | commitdiff |
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>
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>
| builtin/rebase.c | diffblobblamehistory | |
| strbuf.c | diffblobblamehistory | |
| strbuf.h | diffblobblamehistory |