diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-03-30 21:07:16 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-30 21:07:16 (GMT) |
| commit | 42e1cc517b2a57fa2fad6cc41238bfdbc3f4b9d7 (patch) | |
| tree | 30bfc05a903be4375b5330d374ffdefc48686a9a /Documentation | |
| parent | e7cbfd98e3a960450025b58f6678e17c9c01b007 (diff) | |
| parent | 244ea1b5e49081530e0ba5c717db1fdbe2bda73e (diff) | |
| download | git-42e1cc517b2a57fa2fad6cc41238bfdbc3f4b9d7.zip git-42e1cc517b2a57fa2fad6cc41238bfdbc3f4b9d7.tar.gz git-42e1cc517b2a57fa2fad6cc41238bfdbc3f4b9d7.tar.bz2 | |
Merge branch 'ab/case-insensitive-upstream-and-push-marker'
On many keyboards, typing "@{" involves holding down SHIFT key and
one can easily end up with "@{Up..." when typing "@{upstream}". As
the upstream/push keywords do not appear anywhere else in the syntax,
we can safely accept them case insensitively without introducing
ambiguity or confusion to solve this.
* ab/case-insensitive-upstream-and-push-marker:
rev-parse: match @{upstream}, @{u} and @{push} case-insensitively
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/revisions.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt index ba11b9c..75d211f 100644 --- a/Documentation/revisions.txt +++ b/Documentation/revisions.txt @@ -96,7 +96,8 @@ some output processing may assume ref names in UTF-8. 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. + current one. These suffixes are also accepted when spelled in uppercase, and + they mean the same thing no matter the case. '<branchname>@\{push\}', e.g. 'master@\{push\}', '@\{push\}':: The suffix '@\{push}' reports the branch "where we would push to" if @@ -122,6 +123,9 @@ refs/remotes/myfork/mybranch Note in the example that we set up a triangular workflow, where we pull from one location and push to another. In a non-triangular workflow, '@\{push}' is the same as '@\{upstream}', and there is no need for it. ++ +This suffix is also accepted when spelled in uppercase, and means the same +thing no matter the case. '<rev>{caret}', e.g. 'HEAD{caret}, v1.5.1{caret}0':: A suffix '{caret}' to a revision parameter means the first parent of |