X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=pep-git.txt;h=a96594d85db8378e88a126151e47c3b307776a9d;hb=ad6b3de1dd577b4871f333a6be868c35466e81a0;hp=7ac3fb895070f6d015925815837b8b35a374ad8f;hpb=13296423ae7e079af07cebe7360f3ca3b6f4af61;p=git-wiki.git diff --git a/pep-git.txt b/pep-git.txt index 7ac3fb8..a96594d 100644 --- a/pep-git.txt +++ b/pep-git.txt @@ -435,7 +435,7 @@ recommends to use rebase when pulling, i.e. always do ``git pull --rebase`` or even configure automatic setup of rebase for every new branch:: - $ git config branch.autosetuprebase true + $ git config branch.autosetuprebase always and configure rebase for existing branches::