# [PATCH] Documentation: mention config sources for @{upstream} 1 messages from 2014-05-13 to 2014-05-13. Participants: W. Trevor King. Thread: https://gitlist.dev/t/36649 ## W. Trevor King, 2014-05-13 18:46 Subject: [PATCH] Documentation: mention config sources for @{upstream} Message-ID: URL: https://gitlist.dev/e/a1a8ae41b7969f1f8a2b5a42fe7d63eadb15ef4a.1400006756.git.wking%40tremily.us ``` The earlier documentation made vague references to "is set to build on". Flesh that out with references to the config settings, so folks can use git-config(1) to get more detail on what @{upstream} means. For example, @{upstream} does not care about remote.pushdefault or branch..pushremote. Signed-off-by: W. Trevor King --- Documentation/revisions.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt index 5a286d0..0796118 100644 --- a/Documentation/revisions.txt +++ b/Documentation/revisions.txt @@ -94,7 +94,9 @@ some output processing may assume ref names in UTF-8. '@\{upstream\}', e.g. 'master@\{upstream\}', '@\{u\}':: The suffix '@\{upstream\}' to a branchname (short form '@\{u\}') refers to the branch that the branch specified by branchname is set to build on - top of. A missing branchname defaults to the current one. + top of (configured with `branch..remote` and + `branch..merge`). A missing branchname defaults to the + current one. '{caret}', e.g. 'HEAD{caret}, v1.5.1{caret}0':: A suffix '{caret}' to a revision parameter means the first parent of -- 1.9.1.353.gc66d89d ```