diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-06-13 13:19:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-06-13 13:19:40 -0700 |
| commit | ed7f8acbaa3d986a8b4e8d625b2f54355ce15ef0 (patch) | |
| tree | b28ec107bf91e7c460c1fafac96cc9d7208217ed /sequencer.c | |
| parent | 0d107b19890db191c9281bff67180389fb53df24 (diff) | |
| parent | 082ef75b7bfc90ac236afbb857a9552a026832b8 (diff) | |
| download | git-ed7f8acbaa3d986a8b4e8d625b2f54355ce15ef0.tar.xz | |
Merge branch 'js/rebase-cleanup'
Update supporting parts of "git rebase" to remove code that should
no longer be used.
* js/rebase-cleanup:
rebase: fold git-rebase--common into the -p backend
sequencer: the `am` and `rebase--interactive` scripts are gone
.gitignore: there is no longer a built-in `git-rebase--interactive`
t3400: stop referring to the scripted rebase
Drop unused git-rebase--am.sh
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c index f88a97fb10..334de14542 100644 --- a/sequencer.c +++ b/sequencer.c @@ -767,7 +767,7 @@ static int parse_key_value_squoted(char *buf, struct string_list *list) * GIT_AUTHOR_DATE='$author_date' * * where $author_name, $author_email and $author_date are quoted. We are strict - * with our parsing, as the file was meant to be eval'd in the old + * with our parsing, as the file was meant to be eval'd in the now-removed * git-am.sh/git-rebase--interactive.sh scripts, and thus if the file differs * from what this function expects, it is better to bail out than to do * something that the user does not expect. |