X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;ds=inline;f=pep-103.txt;h=ae0e031cbd9936c27317b9c535b1d1c7a1d9fb39;hb=6c79765cc3563e74958aa6e8008eb2c63f951c17;hp=f9388f7017880049fcde014dbafa25fa8e3f3291;hpb=f35791b0e8a1500c9cab2a7f1fb5c5c1b9633f16;p=git-wiki.git diff --git a/pep-103.txt b/pep-103.txt index f9388f7..ae0e031 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 @@ -92,8 +91,9 @@ MacOS X: use git installed with `XCode `_ or install git with `Homebrew `_: ``brew install git``. -`git-cola `_ is a Git GUI -written in Python and GPL licensed. Linux, Windows, MacOS X. +`git-cola `_ (`repository +`_) is a Git GUI written in +Python and GPL licensed. Linux, Windows, MacOS X. `TortoiseGit `_ is a Windows Shell Interface to Git based on TortoiseSVN; open source. @@ -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