diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-02 10:17:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-02 10:17:26 -0700 |
| commit | bdc4204119d2847ea8f1ae5e44614be859951822 (patch) | |
| tree | ff641c05a79b4e5eb6d0428a2d6e2c55fe0935e9 /Documentation/git-checkout.txt | |
| parent | 225c93a3cac93e8c619e5c8af47d2a781eedcacd (diff) | |
| parent | 761a889a97a33d277f8a6607a4696164391f9d5d (diff) | |
| download | git-bdc4204119d2847ea8f1ae5e44614be859951822.tar.gz | |
Merge branch 'maint'
* maint:
git-compat-util.h: use apparently more common __sgi macro to detect SGI IRIX
Documentation: A...B shortcut for checkout and rebase
Documentation/pretty-{formats,options}: better reference for "format:<string>"
Diffstat (limited to 'Documentation/git-checkout.txt')
| -rw-r--r-- | Documentation/git-checkout.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index 4505eb6d84..afda5c36b5 100644 --- a/Documentation/git-checkout.txt +++ b/Documentation/git-checkout.txt @@ -154,6 +154,10 @@ edits from your current working tree. As a special case, the `"@\{-N\}"` syntax for the N-th last branch checks out the branch (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 +merge base of `A` and `B` if there is exactly one merge base. You can +leave out at most one of `A` and `B`, in which case it defaults to `HEAD`. <new_branch>:: Name for the new branch. |