From: Oleg Broytman Date: Sat, 6 Jun 2015 23:32:12 +0000 (+0300) Subject: Fix inline comments X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=42d365e0b9f204b4ce20421749cb96e84e77c519;p=git-wiki.git Fix inline comments According to PEP-8 inline comments must be separated by two spaces. --- diff --git a/pep-git.txt b/pep-git.txt index d45ef5d..24f3878 100644 --- a/pep-git.txt +++ b/pep-git.txt @@ -219,15 +219,15 @@ is equivalent to :: $ git fetch REMOTE BRANCH - $ git merge FETCH_HEAD # FETCH_HEAD is a literal here + $ git merge FETCH_HEAD # FETCH_HEAD is a literal here Certainly, BRANCH in that case should be your current branch. If you want to merge a different branch into your current branch first update that non-current branch and then merge:: - $ git fetch origin v1:v1 # Update v1 - $ git pull --rebase origin v2 # Update the current branch v2 using - # rebase instead of merge + $ git fetch origin v1:v1 # Update v1 + $ git pull --rebase origin v2 # Update the current branch v2 using + # rebase instead of merge $ git merge v1 If you have not yet pushed commits on ``v1``, though, the scenario has @@ -421,12 +421,12 @@ 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 and switch to a new branch ...edit/test/commit... $ git checkout v2 - $ git pull --rebase origin v2 # update v2 from the upstream + $ git pull --rebase origin v2 # update v2 from the upstream $ git merge issue-42 - $ git branch -d issue-42 # delete the topic branch + $ git branch -d issue-42 # delete the topic branch $ git push origin v2 When the topic branch is deleted only the label is removed, commits @@ -447,7 +447,7 @@ Null-merges Git has a builtin strategy for what Python core developers call "null-merge":: - $ git merge -s ours v1 # null-merge v1 into v2 + $ git merge -s ours v1 # null-merge v1 into v2 ReReRe