]> git.ipfire.org Git - thirdparty/git.git/commit - builtin/rebase.c
builtin rebase: support --force-rebase
authorPratik Karki <predatoramigo@gmail.com>
Tue, 4 Sep 2018 21:27:17 +0000 (14:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 6 Sep 2018 18:55:43 +0000 (11:55 -0700)
commit1ed9c14ff25ca567c8416cad0980ea1b595e5723
tree468b943368bfb2245e9b01e6ff31a583c08758f2
parent9a48a615b47d940764e00c872ddbae601a1e5f8a
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>
builtin/rebase.c