diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-02-14 20:54:20 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-02-14 20:54:21 (GMT) |
| commit | d8b8d59054ed5ba2f79d3cb2fad0b5f0bfeb3ac1 (patch) | |
| tree | d7433bfd5fbf38f9f2282be27007ecd03019e09e /sequencer.h | |
| parent | 251187084d5ebdb3ba898ba4a8f9b005b7626655 (diff) | |
| parent | 767a9c417eb2109dda71995c8fb8a884d3a35e6f (diff) | |
| download | git-d8b8d59054ed5ba2f79d3cb2fad0b5f0bfeb3ac1.zip git-d8b8d59054ed5ba2f79d3cb2fad0b5f0bfeb3ac1.tar.gz git-d8b8d59054ed5ba2f79d3cb2fad0b5f0bfeb3ac1.tar.bz2 | |
Merge branch 'ag/rebase-avoid-unneeded-checkout'
"git rebase -i" (and friends) used to unnecessarily check out the
tip of the branch to be rebased, which has been corrected.
* ag/rebase-avoid-unneeded-checkout:
rebase -i: stop checking out the tip of the branch to rebase
Diffstat (limited to 'sequencer.h')
| -rw-r--r-- | sequencer.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sequencer.h b/sequencer.h index 9f9ae29..74f1e26 100644 --- a/sequencer.h +++ b/sequencer.h @@ -190,9 +190,6 @@ void commit_post_rewrite(struct repository *r, const struct commit *current_head, const struct object_id *new_head); -int prepare_branch_to_be_rebased(struct repository *r, struct replay_opts *opts, - const char *commit); - #define SUMMARY_INITIAL_COMMIT (1 << 0) #define SUMMARY_SHOW_AUTHOR_DATE (1 << 1) void print_commit_summary(struct repository *repo, |