kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
70280 Commits
6 Branches
36 Tags
131 MiB
 
 
 
 
 
 
Tree: fe86abd751
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'fe86abd751'
${ noResults }
git/Documentation/rerere-options.txt

9 lines
414 B
Raw Blame History

--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`.