From c94cc6482c0b581e81ffa0c2d48e730a38255a0f Mon Sep 17 00:00:00 2001 From: Oleg Broytman Date: Sun, 7 Jun 2015 01:29:57 +0300 Subject: [PATCH] Add an example, correct grammar and change wording --- pep-git.txt | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pep-git.txt b/pep-git.txt index 2b55d63..dbe0b2a 100644 --- a/pep-git.txt +++ b/pep-git.txt @@ -389,11 +389,11 @@ Merge or rebase? Internet is full of heated discussions on the topic: "merge or rebase?" Most of them are meaningless. When a DVCS is being used in a big team with a big and complex project with many branches there is -simply no way to avoid merges. So the question diminished to "whether -to use rebase, and if yes - when to use rebase?" Considering that it -is very much recommended not to rebase published commits the question -diminished even further: "whether to use rebase on non-pushed -commits?" +simply no way to avoid merges. So the question's diminished to +"whether to use rebase, and if yes - when to use rebase?" Considering +that it is very much recommended not to rebase published commits the +question's diminished even further: "whether to use rebase on +non-pushed commits?" That small question is for the team to decide. The author of the PEP recommends to use rebase when pulling, i.e. always do ``git pull @@ -406,7 +406,11 @@ and configure rebase for existing branches:: $ git config branch.NAME.rebase true -After that ``git pull origin v2`` will be equivalent to ``git pull +For example:: + + $ git config branch.v2.rebase true + +After that ``git pull origin v2`` becomes equivalent to ``git pull --rebase origin v2``. In case when merge is preferred it is recommended to create new -- 2.39.5