made the pack completely portable and wrote relevent bat files to go with it
This commit is contained in:
@@ -0,0 +1,9 @@
|
||||
--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`.
|
||||
Reference in New Issue
Block a user