diff options
| author |  Pratik Karki <predatoramigo@gmail.com> | 2018-09-04 14:59:52 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-09-06 11:56:19 -0700 |
| commit | ead98c111b8a05eb65825f31049e454c8b1ced34 (patch) | |
| tree | 47660a0fb148db8da13f8c42ce21075a21fd5db3 /log-tree.h | |
| parent | builtin rebase: support --signoff (diff) | |
| download | tgif-ead98c111b8a05eb65825f31049e454c8b1ced34.tar.xz | |
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>
Diffstat (limited to 'log-tree.h')
0 files changed, 0 insertions, 0 deletions