{"thread":{"id":"36649","subject":"[PATCH] Documentation: mention config sources for @{upstream}","startedAt":"2014-05-13T18:46:57Z","lastAt":"2014-05-13T18:46:57Z","messageCount":1,"participants":["W. Trevor King"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"241387","messageId":"a1a8ae41b7969f1f8a2b5a42fe7d63eadb15ef4a.1400006756.git.wking@tremily.us","threadId":"36649","inReplyTo":null,"subject":"[PATCH] Documentation: mention config sources for @{upstream}","fromName":"W. Trevor King","fromEmail":"wking@tremily.us","sentAt":"2014-05-13T18:46:57Z","receivedAt":"2014-05-13T18:46:57Z","isPatch":true,"sender":{"key":"wking@tremily.us","avatar":"https://avatars.githubusercontent.com/u/209920?v=4"},"body":"The earlier documentation made vague references to \"is set to build\non\".  Flesh that out with references to the config settings, so folks\ncan use git-config(1) to get more detail on what @{upstream} means.\nFor example, @{upstream} does not care about remote.pushdefault or\nbranch.<name>.pushremote.\n\nSigned-off-by: W. Trevor King <wking@tremily.us>\n---\n Documentation/revisions.txt | 4 +++-\n 1 file changed, 3 insertions(+), 1 deletion(-)\n\ndiff --git a/Documentation/revisions.txt b/Documentation/revisions.txt\nindex 5a286d0..0796118 100644\n--- a/Documentation/revisions.txt\n+++ b/Documentation/revisions.txt\n@@ -94,7 +94,9 @@ some output processing may assume ref names in UTF-8.\n '<branchname>@\\{upstream\\}', e.g. 'master@\\{upstream\\}', '@\\{u\\}'::\n   The suffix '@\\{upstream\\}' to a branchname (short form '<branchname>@\\{u\\}')\n   refers to the branch that the branch specified by branchname is set to build on\n-  top of.  A missing branchname defaults to the current one.\n+  top of (configured with `branch.<name>.remote` and\n+  `branch.<name>.merge`).  A missing branchname defaults to the\n+  current one.\n \n '<rev>{caret}', e.g. 'HEAD{caret}, v1.5.1{caret}0'::\n   A suffix '{caret}' to a revision parameter means the first parent of\n-- \n1.9.1.353.gc66d89d\n"}]}