BLACKSITE
:
216.73.216.249
:
157.173.108.86 / pdclassessgnr.in
:
Linux server.madnetech.com 4.18.0-553.117.1.el8_10.x86_64 #1 SMP Sun Apr 5 23:14:32 EDT 2026 x86_64
:
/
usr
/
share
/
doc
/
git
/
Upload File:
files >> //usr/share/doc/git/rerere-options.txt
--rerere-autoupdate:: --no-rerere-autoupdate:: After the rerere mechanism reuses a recorded resolution on the current conflict to update the files in the working tree, allow it to also update the index with the result of resolution. `--no-rerere-autoupdate` is a good way to double-check what `rerere` did and catch potential mismerges, before committing the result to the index with a separate `git add`.