From: Oleg Broytman Date: Sat, 27 Jun 2015 18:45:07 +0000 (+0300) Subject: Change wording X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;ds=sidebyside;h=7efb12688ef3a49a91b91a37f0f999e9f32f2847;p=git-wiki.git Change wording --- diff --git a/pep-git.txt b/pep-git.txt index a16cbea..f9dbb62 100644 --- a/pep-git.txt +++ b/pep-git.txt @@ -142,9 +142,9 @@ Branches and branches Git terminology can be a bit misleading. Take, for example, the term "branch". In git it has two meanings. A branch is a directed line of commits (possibly with merges). And a branch is a label or a pointer -assigned to a line of commits. It is important to differentiate when -you talk about commits and when about their labels. Lines of commits -are by itself unnamed and are usually only lengthening and merging. +assigned to a line of commits. It is important to distinguish when you +talk about commits and when about their labels. Lines of commits are +by itself unnamed and are usually only lengthening and merging. Labels, on the other hand, can be created, moved, renamed and deleted freely. @@ -402,7 +402,7 @@ file(s) to that one of a commit. Like this:: git checkout HEAD~ README The commands restores the contents of README file to the last but one -commit in the current branch. By default a commit ID is simple HEAD; +commit in the current branch. By default a commit ID is simply HEAD; i.e. ``git checkout README`` restores README to the latest commit. (Do not use ``git checkout`` to view a content of a file in a commit, @@ -411,7 +411,7 @@ use ``git cat-file -p``; e.g. ``git cat-file -p HEAD~:path/to/README``). ``git reset`` moves the head of the current branch. The head can be moved to point to any commit but it's often used to remove a commit or a few (preferably, non-pushed ones) from the top of the branch - that -is, to move the branch backward in order to undo a few non-pushed +is, to move the branch backward in order to undo a few (non-pushed) commits. ``git reset`` has three modes of operation - soft, hard and mixed.