X-Git-Url: https://git.phdru.name/?p=git-wiki.git;a=blobdiff_plain;f=pep-103.txt;h=d11403345a0d6bd24fc863992becc4ac7b907f23;hp=bbcb3d46408a8d9f6054cff8e42f9ed52d8616b1;hb=7ba22e6bc0b8a7e77d5c3e26995e458fb2784976;hpb=a93ea3ef2756a08be7327badb3f04500a9971a68 diff --git a/pep-103.txt b/pep-103.txt index bbcb3d4..d114033 100644 --- a/pep-103.txt +++ b/pep-103.txt @@ -775,7 +775,7 @@ working tree:: $ git config rerere.autoupdate true You don't need to turn rerere on globally - you don't want rerere in -bare repositories or single-branche repositories; you only need rerere +bare repositories or single-branch repositories; you only need rerere in repos where you often perform merges and resolve merge conflicts. See `Rerere `_ in The