diff options
| author |  Pratik Karki <predatoramigo@gmail.com> | 2018-09-04 14:27:17 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-09-06 11:55:43 -0700 |
| commit | 1ed9c14ff25ca567c8416cad0980ea1b595e5723 (patch) | |
| tree | 468b943368bfb2245e9b01e6ff31a583c08758f2 /git-merge-one-file.sh | |
| parent | builtin rebase: try to fast forward when possible (diff) | |
| download | tgif-1ed9c14ff25ca567c8416cad0980ea1b595e5723.tar.xz | |
builtin rebase: support --force-rebase
In this commit, we add support to `--force-rebase` option. The
equivalent part of the shell script found in `git-legacy-rebase.sh` is
converted as faithfully as possible to C.
The --force-rebase option ensures that the rebase does not simply
fast-forward even if it could.
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 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions