diff options
| author |  Kacper Kornet <draenog@pld-linux.org> | 2013-03-16 19:51:43 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-03-17 00:10:59 -0700 |
| commit | 47e329ef7c46de8ccdc8c4e40333579264a83c21 (patch) | |
| tree | 5a61a0e37d7930a21e153aa0fd010308aecf2dc8 /mergetools/p4merge | |
| parent | sha1_name: pass object name length to diagnose_invalid_sha1_path() (diff) | |
| download | tgif-47e329ef7c46de8ccdc8c4e40333579264a83c21.tar.xz | |
rev-parse: clarify documentation of $name@{upstream} syntax
"git rev-parse" interprets string in string@{upstream} as a name of
a branch not a ref. For example, refs/heads/master@{upstream} looks
for an upstream branch that is merged by git-pull to ref
refs/heads/refs/heads/master not to refs/heads/master.
However the documentation could mislead a user to believe that the
string is interpreted as ref.
Signed-off-by: Kacper Kornet <draenog@pld-linux.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/p4merge')
0 files changed, 0 insertions, 0 deletions