From 6019acb059772a8537fd0df9a1ddd5dc65620916 Mon Sep 17 00:00:00 2001 From: Oleg Broytman Date: Thu, 25 Jun 2015 20:48:08 +0300 Subject: [PATCH 1/1] Enhance description --- pep-git.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pep-git.txt b/pep-git.txt index c2bb7dd..53e30d6 100644 --- a/pep-git.txt +++ b/pep-git.txt @@ -427,7 +427,7 @@ conflicts at once you can merge the topic branch to the mainline from time to time and switch back to the topic branch to continue working on it. The entire workflow would be something like:: - $ git checkout -b issue-42 # create and switch to a new branch + $ git checkout -b issue-42 # create a new issue branch and switch to it ...edit/test/commit... $ git checkout v2 $ git pull --rebase origin v2 # update v2 from the upstream -- 2.39.2