From: Oleg Broytman Date: Tue, 28 Jun 2016 19:53:58 +0000 (+0300) Subject: PEP-8 recommends two spaces before inline comment X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=dd3e04dae75f9c5215cc18eeb7e96c90b13158f1;p=git-wiki.git PEP-8 recommends two spaces before inline comment --- diff --git a/pep-103.txt b/pep-103.txt index f9388f7..eae4ff7 100644 --- a/pep-103.txt +++ b/pep-103.txt @@ -532,11 +532,11 @@ For example, if you want to reset the branch ``master`` back to the original commit but preserve two commits created in the current branch do something like:: - $ git branch save-master # create a new branch saving master - $ git reflog # find the original place of master + $ git branch save-master # create a new branch saving master + $ git reflog # find the original place of master $ git reset $COMMIT_ID $ git cherry-pick save-master~ save-master - $ git branch -D save-master # remove temporary branch + $ git branch -D save-master # remove temporary branch git revert: revert a commit @@ -888,7 +888,7 @@ has an option ``-O`` that passes a list of names of the found files to a program; default program for ``-O`` is a pager (usually ``less``), but you can use your editor:: - $ git grep -Ovim # but not -O vim + $ git grep -Ovim # but not -O vim BTW, if git is instructed to use ``less`` as the pager (i.e., if pager is not configured in git at all it uses ``less`` by default, or if it