summaryrefslogtreecommitdiff
path: root/path.h
diff options
context:
space:
mode:
authorLibravatar Pratik Karki <predatoramigo@gmail.com>2018-09-04 14:59:52 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-09-06 11:56:19 -0700
commitead98c111b8a05eb65825f31049e454c8b1ced34 (patch)
tree47660a0fb148db8da13f8c42ce21075a21fd5db3 /path.h
parentbuiltin rebase: support --signoff (diff)
downloadtgif-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 'path.h')
0 files changed, 0 insertions, 0 deletions