diff options
author | Pratik Karki <predatoramigo@gmail.com> | 2018-08-08 18:06:16 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-09-06 21:55:58 +0300 |
commit | f95736288a3a8d0168af3fc05dc4251edf0d0b47 (patch) | |
tree | 280d5684d592d90ebfa5f818041764ec8a7a2b34 /strbuf.h | |
parent | e65123a71d0ca134f901e2340674a712e70ce023 (diff) |
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 'strbuf.h')
-rw-r--r-- | strbuf.h | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -190,6 +190,9 @@ extern void strbuf_ltrim(struct strbuf *); /* Strip trailing directory separators */ extern void strbuf_trim_trailing_dir_sep(struct strbuf *); +/* Strip trailing LF or CR/LF */ +extern void strbuf_trim_trailing_newline(struct strbuf *sb); + /** * Replace the contents of the strbuf with a reencoded form. Returns -1 * on error, 0 on success. |