]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 73d51ed) | patch
builtin rebase: support --rerere-autoupdate
authorPratik Karki <predatoramigo@gmail.com>
Tue, 4 Sep 2018 21:59:52 +0000 (14:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 6 Sep 2018 18:56:19 +0000 (11:56 -0700)
commitead98c111b8a05eb65825f31049e454c8b1ced34
tree47660a0fb148db8da13f8c42ce21075a21fd5db3tree | snapshot
parent73d51ed0a59f561e55ab1b649eb073e7dddf8b88commit | diff
builtin rebase: support --rerere-autoupdate

The `--rerere-autoupdate` option allows rerere to update the index with
resolved conflicts. This commit follows closely the equivalent part of
`git-legacy-rebase.sh`.

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 diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.