diff options
author | Junio C Hamano <gitster@pobox.com> | 2022-07-27 20:19:52 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-07-27 20:19:52 (GMT) |
commit | 32290a581834517a6447f3091e5de32fe4eca0b4 (patch) | |
tree | 15d4be09ce611a476056d8dabc339f9f1ea445ce /Documentation/revisions.txt | |
parent | e3d49aa5aa8beb4b535ef916c4b9174093efd36c (diff) | |
parent | 8cdab69d967ec826ed258e31a26c8cb4720ffdca (diff) | |
download | git-32290a581834517a6447f3091e5de32fe4eca0b4.zip git-32290a581834517a6447f3091e5de32fe4eca0b4.tar.gz git-32290a581834517a6447f3091e5de32fe4eca0b4.tar.bz2 |
Merge branch 'tk/rev-parse-doc-clarify-at-u' into maint
Doc update.
source: <pull.1265.v2.git.1655960512385.gitgitgadget@gmail.com>
* tk/rev-parse-doc-clarify-at-u:
rev-parse: documentation adjustment - mention remote tracking with @{u}
Diffstat (limited to 'Documentation/revisions.txt')
-rw-r--r-- | Documentation/revisions.txt | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt index cef8c3c..e3e3501 100644 --- a/Documentation/revisions.txt +++ b/Documentation/revisions.txt @@ -96,19 +96,16 @@ some output processing may assume ref names in UTF-8. before the current one. '[<branchname>]@\{upstream\}', e.g. 'master@\{upstream\}', '@\{u\}':: - The suffix '@\{upstream\}' to a branchname (short form '<branchname>@\{u\}') - refers to the branch that the branch specified by branchname is set to build on - top of (configured with `branch.<name>.remote` and - `branch.<name>.merge`). A missing branchname defaults to the - current one. These suffixes are also accepted when spelled in uppercase, and - they mean the same thing no matter the case. + A branch B may be set up to build on top of a branch X (configured with + `branch.<name>.merge`) at a remote R (configured with + `branch.<name>.remote`). B@{u} refers to the remote-tracking branch for + the branch X taken from remote R, typically found at `refs/remotes/R/X`. '[<branchname>]@\{push\}', e.g. 'master@\{push\}', '@\{push\}':: The suffix '@\{push}' reports the branch "where we would push to" if `git push` were run while `branchname` was checked out (or the current - `HEAD` if no branchname is specified). Since our push destination is - in a remote repository, of course, we report the local tracking branch - that corresponds to that branch (i.e., something in `refs/remotes/`). + `HEAD` if no branchname is specified). Like for '@\{upstream\}', we report + the remote-tracking branch that corresponds to that branch at the remote. + Here's an example to make it more clear: + |