X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=pep-103.txt;h=8b93ca4dd5986722eea42681d7343f9a722d4d67;hb=990c15d691a91dacb52ff014868cf27b1f26c743;hp=5f7998a8e7c374f827fe973bb63b96bf7032f926;hpb=5cf9f4d906a35f510fe4e2f5f05fda5b08b746b6;p=git-wiki.git diff --git a/pep-103.txt b/pep-103.txt index 5f7998a..8b93ca4 100644 --- a/pep-103.txt +++ b/pep-103.txt @@ -82,8 +82,7 @@ Unix users: `download and install using your package manager `_. Microsoft Windows: download `git-for-windows -`_ or `msysGit -`_. +`_. MacOS X: use git installed with `XCode `_ or download from @@ -532,11 +531,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 @@ -773,7 +772,7 @@ Wiki. Root -==== +---- Git switches to the root (top-level directory of the project where ``.git`` subdirectory exists) before running any command. Git @@ -801,7 +800,7 @@ we run the commands from a subdirectory, not from the root. ReReRe -====== +------ Rerere is a mechanism that helps to resolve repeated merge conflicts. The most frequent source of recurring merge conflicts are topic @@ -830,7 +829,7 @@ Book. Database maintenance -==================== +-------------------- Git object database and other files/directories under ``.git`` require periodic maintenance and cleanup. For example, commit editing left @@ -888,7 +887,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