Browse Source

Merge branch 'tr/nth-previous-is-a-commit'

* tr/nth-previous-is-a-commit:
  Documentation: @{-N} can refer to a commit
maint
Junio C Hamano 11 years ago
parent
commit
c380cf85a7
  1. 4
      Documentation/git-checkout.txt
  2. 2
      Documentation/revisions.txt

4
Documentation/git-checkout.txt

@ -232,8 +232,8 @@ section of linkgit:git-add[1] to learn how to operate the `--patch` mode. @@ -232,8 +232,8 @@ section of linkgit:git-add[1] to learn how to operate the `--patch` mode.
commit, your HEAD becomes "detached" and you are no longer on
any branch (see below for details).
+
As a special case, the `"@{-N}"` syntax for the N-th last branch
checks out the branch (instead of detaching). You may also specify
As a special case, the `"@{-N}"` syntax for the N-th last branch/commit
checks out branches (instead of detaching). You may also specify
`-` which is synonymous with `"@{-1}"`.
+
As a further special case, you may use `"A...B"` as a shortcut for the

2
Documentation/revisions.txt

@ -88,7 +88,7 @@ some output processing may assume ref names in UTF-8. @@ -88,7 +88,7 @@ some output processing may assume ref names in UTF-8.
branch 'blabla' then '@\{1\}' means the same as 'blabla@\{1\}'.

'@\{-<n>\}', e.g. '@\{-1\}'::
The construct '@\{-<n>\}' means the <n>th branch checked out
The construct '@\{-<n>\}' means the <n>th branch/commit checked out
before the current one.

'<branchname>@\{upstream\}', e.g. 'master@\{upstream\}', '@\{u\}'::

Loading…
Cancel
Save