diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-11-02 05:04:54 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-11-02 05:04:54 +0300 |
commit | 39f73315454d2553b2d3219a58f5110a60eba5a1 (patch) | |
tree | 2a55eab60e69c17bba16f115e775ce1aacf49e6f /strbuf.h | |
parent | e0720a3867b85ad2fe0e92378973670b8b7f444b (diff) | |
parent | 0eabf4b95ca2d3213194de95cc9cd62593811965 (diff) |
Merge branch 'pk/rebase-in-c-3-acts'
Rewrite "git rebase" in C.
* pk/rebase-in-c-3-acts:
builtin rebase: stop if `git am` is in progress
builtin rebase: actions require a rebase in progress
builtin rebase: support --edit-todo and --show-current-patch
builtin rebase: support --quit
builtin rebase: support --abort
builtin rebase: support --skip
builtin rebase: support --continue
Diffstat (limited to 'strbuf.h')
-rw-r--r-- | strbuf.h | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -190,6 +190,9 @@ void strbuf_ltrim(struct strbuf *sb); /* Strip trailing directory separators */ void strbuf_trim_trailing_dir_sep(struct strbuf *sb); +/* Strip trailing LF or CR/LF */ +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. |