{"thread":{"id":"31914","subject":"git merge man page, upstream","startedAt":"2012-10-23T07:40:25Z","lastAt":"2012-10-25T09:54:27Z","messageCount":7,"participants":["Angelo Borsotti","Matthieu Moy","Jeff King"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"201722","messageId":"CAB9Jk9BT3F1_yvf7jQQyT72_EWskFS4bEgXCkmJs7uZOPhEK8w@mail.gmail.com","threadId":"31914","inReplyTo":null,"subject":"git merge man page, upstream","fromName":"Angelo Borsotti","fromEmail":"angelo.borsotti@gmail.com","sentAt":"2012-10-23T07:40:25Z","receivedAt":"2012-10-23T07:40:25Z","isPatch":false,"sender":{"key":"angelo.borsotti@gmail.com","avatar":null},"body":"Hello,\n\nthe git merge man page, OPTIONS, <commit> ... states:\n\n   \"If no commit is given from the command line, and if\nmerge.defaultToUpstream configuration variable is set, merge the\nremote tracking branches that the current branch is configured to use\nas its upstream. See also the configuration section of this manual\npage.\"\n\nActually, in this case git merge merges the upstream branch, not the\nremote tracking branch.\n\nProposed change:\n\n   \"If no commit is given from the command line, and if\nmerge.defaultToUpstream configuration variable is set, merge the\nupstream branches that the current branch has currently configured.\nSee also the configuration section of this manual page.\"\n\n-Angelo Borsotti\n"},{"id":"201723","messageId":"vpqk3uhr5gp.fsf@grenoble-inp.fr","threadId":"31914","inReplyTo":"CAB9Jk9BT3F1_yvf7jQQyT72_EWskFS4bEgXCkmJs7uZOPhEK8w@mail.gmail.com","subject":"Re: git merge man page, upstream","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@grenoble-inp.fr","sentAt":"2012-10-23T07:51:50Z","receivedAt":"2012-10-23T07:51:50Z","isPatch":false,"sender":{"key":"matthieu.moy@grenoble-inp.fr","avatar":"https://gravatar.com/avatar/72c8a2705971a25dfaff23cece15130d405685845d911aedd5667ace277f3fc5?d=mp&s=160"},"body":"Angelo Borsotti <angelo.borsotti@gmail.com> writes:\n\n> Hello,\n>\n> the git merge man page, OPTIONS, <commit> ... states:\n>\n>    \"If no commit is given from the command line, and if\n> merge.defaultToUpstream configuration variable is set, merge the\n> remote tracking branches that the current branch is configured to use\n> as its upstream. See also the configuration section of this manual\n> page.\"\n>\n> Actually, in this case git merge merges the upstream branch, not the\n> remote tracking branch.\n\nIt merges the upstream branch, which is a remote-tracking branch (notice\nthe - between remote and tracking, it's a branch that tracks a remote\nbranch, not a remote branch that tracks something).\n\nI'll send a patch to fix that.\n\n-- \nMatthieu Moy\nhttp://www-verimag.imag.fr/~moy/\n"},{"id":"201724","messageId":"CAB9Jk9CEbT=Y=yjw2tPSLiLibejDSheabcBPEpHCLa_TS+6Cpw@mail.gmail.com","threadId":"31914","inReplyTo":"vpqk3uhr5gp.fsf@grenoble-inp.fr","subject":"Re: git merge man page, upstream","fromName":"Angelo Borsotti","fromEmail":"angelo.borsotti@gmail.com","sentAt":"2012-10-23T09:07:15Z","receivedAt":"2012-10-23T09:07:15Z","isPatch":false,"sender":{"key":"angelo.borsotti@gmail.com","avatar":null},"body":"Hi Matthieu,\n\nthe upstream branch can also be a local branch.\n\n-Angelo\n"},{"id":"201728","messageId":"1350992045-11141-1-git-send-email-Matthieu.Moy@imag.fr","threadId":"31914","inReplyTo":"vpqk3uhr5gp.fsf@grenoble-inp.fr","subject":"[PATCH] Documentation: remote tracking branch -> remote-tracking branch","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@imag.fr","sentAt":"2012-10-23T11:34:05Z","receivedAt":"2012-10-23T11:34:05Z","isPatch":true,"sender":{"key":"git@matthieu-moy.fr","avatar":"https://avatars.githubusercontent.com/u/14709?v=4"},"body":"This change was already done by 0e615b252f3 (Matthieu Moy, Tue Nov 2\n2010, Replace \"remote tracking\" with \"remote-tracking\"), but new\ninstances of remote tracking (without dash) were introduced in the\nmeantime.\n\nSigned-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>\n---\nHere's the patch.\n\nI'm not opposed to dropping completely the remote-tracking part in the\ncase of merge (i.e. \"remote-tracking branches that the current branch\nis configured to use as its upstream\" -> \"upstream branch\") on top of\nthat, but if we do this, merge-config.txt should be updated too).\n\n Documentation/git-clone.txt    | 4 ++--\n Documentation/git-merge.txt    | 2 +-\n Documentation/git-push.txt     | 2 +-\n Documentation/merge-config.txt | 4 ++--\n 4 files changed, 6 insertions(+), 6 deletions(-)\n\ndiff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt\nindex 6d98ef3..7fefdb0 100644\n--- a/Documentation/git-clone.txt\n+++ b/Documentation/git-clone.txt\n@@ -196,9 +196,9 @@ objects from the source repository into a pack in the cloned repository.\n \t`--no-single-branch` is given to fetch the histories near the\n \ttips of all branches.\n \tFurther fetches into the resulting repository will only update the\n-\tremote tracking branch for the branch this option was used for the\n+\tremote-tracking branch for the branch this option was used for the\n \tinitial cloning.  If the HEAD at the remote did not point at any\n-\tbranch when `--single-branch` clone was made, no remote tracking\n+\tbranch when `--single-branch` clone was made, no remote-tracking\n \tbranch is created.\n \n --recursive::\ndiff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt\nindex 20f9228..d34ea3c 100644\n--- a/Documentation/git-merge.txt\n+++ b/Documentation/git-merge.txt\n@@ -99,7 +99,7 @@ commit or stash your changes before running 'git merge'.\n \tmore than two parents (affectionately called an Octopus merge).\n +\n If no commit is given from the command line, and if `merge.defaultToUpstream`\n-configuration variable is set, merge the remote tracking branches\n+configuration variable is set, merge the remote-tracking branches\n that the current branch is configured to use as its upstream.\n See also the configuration section of this manual page.\n \ndiff --git a/Documentation/git-push.txt b/Documentation/git-push.txt\nindex 22d2580..fe46c42 100644\n--- a/Documentation/git-push.txt\n+++ b/Documentation/git-push.txt\n@@ -175,7 +175,7 @@ useful if you write an alias or script around 'git push'.\n \n --recurse-submodules=check|on-demand::\n \tMake sure all submodule commits used by the revisions to be\n-\tpushed are available on a remote tracking branch. If 'check' is\n+\tpushed are available on a remote-tracking branch. If 'check' is\n \tused git will verify that all submodule commits that changed in\n \tthe revisions to be pushed are available on at least one remote\n \tof the submodule. If any commits are missing the push will be\ndiff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt\nindex 861bd6f..9bb4956 100644\n--- a/Documentation/merge-config.txt\n+++ b/Documentation/merge-config.txt\n@@ -9,11 +9,11 @@ merge.conflictstyle::\n merge.defaultToUpstream::\n \tIf merge is called without any commit argument, merge the upstream\n \tbranches configured for the current branch by using their last\n-\tobserved values stored in their remote tracking branches.\n+\tobserved values stored in their remote-tracking branches.\n \tThe values of the `branch.<current branch>.merge` that name the\n \tbranches at the remote named by `branch.<current branch>.remote`\n \tare consulted, and then they are mapped via `remote.<remote>.fetch`\n-\tto their corresponding remote tracking branches, and the tips of\n+\tto their corresponding remote-tracking branches, and the tips of\n \tthese tracking branches are merged.\n \n merge.ff::\n-- \n1.7.12.410.g5f38766\n"},{"id":"201729","messageId":"vpqehkpqv3k.fsf@grenoble-inp.fr","threadId":"31914","inReplyTo":"CAB9Jk9CEbT=Y=yjw2tPSLiLibejDSheabcBPEpHCLa_TS+6Cpw@mail.gmail.com","subject":"Re: git merge man page, upstream","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@grenoble-inp.fr","sentAt":"2012-10-23T11:35:43Z","receivedAt":"2012-10-23T11:35:43Z","isPatch":false,"sender":{"key":"matthieu.moy@grenoble-inp.fr","avatar":"https://gravatar.com/avatar/72c8a2705971a25dfaff23cece15130d405685845d911aedd5667ace277f3fc5?d=mp&s=160"},"body":"Angelo Borsotti <angelo.borsotti@gmail.com> writes:\n\n> Hi Matthieu,\n>\n> the upstream branch can also be a local branch.\n\nIn this case, it's:\n\n[branch \"branch\"]\n        remote = .\n        merge = refs/heads/master\n\nwhich can arguably be considered as a special case of remote branch\nwhose location happens to be \".\". But as said in the patch, I don't mind\nif someone wants to drop the remote-tracking mention on top of my patch.\n\n-- \nMatthieu Moy\nhttp://www-verimag.imag.fr/~moy/\n"},{"id":"201738","messageId":"CAB9Jk9C3hybpSNMZE-PYKWS7ZQbC7BwmBkhv9-UaeJXbB_sz3w@mail.gmail.com","threadId":"31914","inReplyTo":"vpqehkpqv3k.fsf@grenoble-inp.fr","subject":"Re: git merge man page, upstream","fromName":"Angelo Borsotti","fromEmail":"angelo.borsotti@gmail.com","sentAt":"2012-10-23T17:30:03Z","receivedAt":"2012-10-23T17:30:03Z","isPatch":false,"sender":{"key":"angelo.borsotti@gmail.com","avatar":null},"body":"Hi Matthiew,\n\nman pages should be clear, and easy to read. \"Remote\" usually means\n\"another repository\"\n(git glossary), and also in natural language conveys the notion of\nsomething far away.\nInternally, it can be handled as a special case of url, of course.\nMy suggestion is to be consistent with the git glossary, that defines\n\"upstream branch\" as: \"The default branch that is merged into the\nbranch in question\", which is exactly what that paragraph of the\ngit-merge man page is describing.\n\n-Angelo\n"},{"id":"201881","messageId":"20121025095427.GL8390@sigill.intra.peff.net","threadId":"31914","inReplyTo":"1350992045-11141-1-git-send-email-Matthieu.Moy@imag.fr","subject":"Re: [PATCH] Documentation: remote tracking branch -> remote-tracking branch","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2012-10-25T09:54:27Z","receivedAt":"2012-10-25T09:54:27Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Tue, Oct 23, 2012 at 01:34:05PM +0200, Matthieu Moy wrote:\n\n> This change was already done by 0e615b252f3 (Matthieu Moy, Tue Nov 2\n> 2010, Replace \"remote tracking\" with \"remote-tracking\"), but new\n> instances of remote tracking (without dash) were introduced in the\n> meantime.\n\nThanks. It seems like an obvious step forward.\n\n> I'm not opposed to dropping completely the remote-tracking part in the\n> case of merge (i.e. \"remote-tracking branches that the current branch\n> is configured to use as its upstream\" -> \"upstream branch\") on top of\n> that, but if we do this, merge-config.txt should be updated too).\n\nYeah, I do not care too deeply, but I think it reads just fine without\nmentioning remote-tracking at all.\n\n-Peff\n"}]}