Re: [PATCH 3/3] revisions.txt: language improvements
From: Michael J Gruber <hidden>
Date: 2016-06-15 22:50:57
Bert Wesarg venit, vidit, dixit 31.03.2011 14:19:
On Thu, Mar 31, 2011 at 13:03, Michael J Gruber [off-list ref] wrote:quoted
Signed-off-by: Michael J Gruber <redacted> --- Documentation/revisions.txt | 68 +++++++++++++++++++++--------------------- 1 files changed, 34 insertions(+), 34 deletions(-)diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt index fa399df..288fa6e 100644 --- a/Documentation/revisions.txt +++ b/Documentation/revisions.txt@@ -27,30 +27,30 @@ blobs contained in a commit. When ambiguous, a '<name>' is disambiguated by taking the first match in the following rules: - . if '$GIT_DIR/<name>' exists, that is what you mean (this is usually + . If '$GIT_DIR/<name>' exists, that is what you mean (this is usually useful only for 'HEAD', 'FETCH_HEAD', 'ORIG_HEAD', 'MERGE_HEAD' and 'CHERRY_PICK_HEAD'); - . otherwise, 'refs/<name>' if exists; + . otherwise, 'refs/<name>' if it exists; - . otherwise, 'refs/tags/<refname>' if exists; + . otherwise, 'refs/tags/<refname>' if it exists; - . otherwise, 'refs/heads/<name>' if exists; + . otherwise, 'refs/heads/<name>' if it exists; - . otherwise, 'refs/remotes/<name>' if exists; + . otherwise, 'refs/remotes/<name>' if it exists; - . otherwise, 'refs/remotes/<name>/HEAD' if exists. + . otherwise, 'refs/remotes/<name>/HEAD' it if exists.s/it if/if it/
Uh, thanks. Waiting for more feedback before a re-roll.
quoted
+ -'HEAD' names the commit your changes in the working tree is based on. -'FETCH_HEAD' records the branch you fetched from a remote repository +'HEAD' names the commit on which you based the changes in the working tree. +'FETCH_HEAD' records the branch which you fetched from a remote repository with your last `git fetch` invocation. -'ORIG_HEAD' is created by commands that moves your 'HEAD' in a drastic +'ORIG_HEAD' is created by commands that move your 'HEAD' in a drastic way, to record the position of the 'HEAD' before their operation, so that -you can change the tip of the branch back to the state before you ran -them easily. -'MERGE_HEAD' records the commit(s) you are merging into your branch +you can easily change the tip of the branch back to the state before you ran +them. +'MERGE_HEAD' records the commit(s) which you are merging into your branch when you run `git merge`. -'CHERRY_PICK_HEAD' records the commit you are cherry-picking +'CHERRY_PICK_HEAD' records the commit which you are cherry-picking when you run `git cherry-pick`. + Note that any of the 'refs/*' cases above may come either from