On Thu, Mar 31, 2011 at 13:03, Michael J Gruber <git@xxxxxxxxxxxxxxxxxxxx> wrote: > Signed-off-by: Michael J Gruber <git@xxxxxxxxxxxxxxxxxxxx> > --- > Â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/ > Â+ > -'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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html