diff options
| author |  Pratik Karki <predatoramigo@gmail.com> | 2018-09-04 14:27:16 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-09-06 11:55:43 -0700 |
| commit | 9a48a615b47d940764e00c872ddbae601a1e5f8a (patch) | |
| tree | d5b8aa4c45e1f13ecd7e45d64fffdb221920ef92 /csum-file.c | |
| parent | builtin rebase: require a clean worktree (diff) | |
| download | tgif-9a48a615b47d940764e00c872ddbae601a1e5f8a.tar.xz | |
builtin rebase: try to fast forward when possible
In this commit, we add support to fast forward.
Note: we will need the merge base later, therefore the call to
can_fast_forward() really needs to be the first one when testing whether
we can skip the rebase entirely (otherwise, it would make more sense to
skip the possibly expensive operation if, say, running an interactive
rebase).
Signed-off-by: Pratik Karki <predatoramigo@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'csum-file.c')
0 files changed, 0 insertions, 0 deletions