{"thread":{"id":"6638","subject":"[PATCH] config.txt: update branch..merge documentation","startedAt":"2007-02-03T15:29:40Z","lastAt":"2007-02-04T00:38:30Z","messageCount":6,"participants":["Santi Béjar","Yann Dirson","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"33447","messageId":"87irejgsyj.fsf@gmail.com","threadId":"6638","inReplyTo":null,"subject":"[PATCH] config.txt: update branch..merge documentation","fromName":"Santi Béjar","fromEmail":"sbejar@gmail.com","sentAt":"2007-02-03T15:29:40Z","receivedAt":"2007-02-03T15:29:40Z","isPatch":true,"sender":{"key":"santi@agolina.net","avatar":null},"body":"\n\nSigned-off-by: Santi Béjar \n---\n Documentation/config.txt | 7 ++++---\n 1 files changed, 4 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex e5e019f..f129de9 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -233,11 +233,12 @@ branch..remote::\n branch..merge::\n \tWhen in branch , it tells `git fetch` the default refspec to\n \tbe marked for merging in FETCH_HEAD. The value has exactly to match\n-\ta remote part of one of the refspecs which are fetched from the remote\n-\tgiven by \"branch..remote\".\n+\tthe remote or local part of one of the refspecs which are fetched\n+\tfrom the remote given by \"branch..remote\".\n \tThe merge information is used by `git pull` (which at first calls\n \t`git fetch`) to lookup the default branch for merging. Without\n-\tthis option, `git pull` defaults to merge the first refspec fetched.\n+\tthis option and when fetching a non default remote, `git pull`\n+\tdefaults to merge the first refspec fetched.\n \tSpecify multiple values to get an octopus merge.\n \n color.branch::\n-- \n1.5.0.rc2.579.g7df8\n"},{"id":"33449","messageId":"20070203155652.GL5362@nan92-1-81-57-214-146.fbx.proxad.net","threadId":"6638","inReplyTo":"87irejgsyj.fsf@gmail.com","subject":"Re: [PATCH] config.txt: update branch..merge documentation","fromName":"Yann Dirson","fromEmail":"ydirson@altern.org","sentAt":"2007-02-03T15:56:52Z","receivedAt":"2007-02-03T15:56:52Z","isPatch":true,"sender":{"key":"ydirson@altern.org","avatar":"https://avatars.githubusercontent.com/u/1190950?v=4"},"body":"On Sat, Feb 03, 2007 at 04:29:40PM +0100, Santi Béjar wrote:\n> diff --git a/Documentation/config.txt b/Documentation/config.txt\n> index e5e019f..f129de9 100644\n> --- a/Documentation/config.txt\n> +++ b/Documentation/config.txt\n> @@ -233,11 +233,12 @@ branch..remote::\n> branch..merge::\n> \tWhen in branch , it tells `git fetch` the default refspec to\n> \tbe marked for merging in FETCH_HEAD. The value has exactly to match\n> -\ta remote part of one of the refspecs which are fetched from the remote\n> -\tgiven by \"branch..remote\".\n> +\tthe remote or local part of one of the refspecs which are fetched\n> +\tfrom the remote given by \"branch..remote\".\n\nSince both local and remote refs are allowed, it would be useful to\nknow how git-fetch decides how to handle them. Looks like the 1st\nfetch refspec with that ref on either side is selected.\n\ngit-parser-remote also looks branch.*.merge with --get-all, so it is\ninteresting to know what happens for multiple values (if git-fetch\njust marks them all, how does git-pull react ?). That's also useful\nto know for porcelain writers wanting to parse FETCH_HEAD.\n\nBest regards,\n-- \nYann.\n"},{"id":"33453","messageId":"8aa486160702030819k24a42ac4w115b83980d3ee17e@mail.gmail.com","threadId":"6638","inReplyTo":"20070203155652.GL5362@nan92-1-81-57-214-146.fbx.proxad.net","subject":"Re: [PATCH] config.txt: update branch..merge documentation","fromName":"Santi Béjar","fromEmail":"sbejar@gmail.com","sentAt":"2007-02-03T16:19:53Z","receivedAt":"2007-02-03T16:19:53Z","isPatch":true,"sender":{"key":"santi@agolina.net","avatar":null},"body":"On 2/3/07, Yann Dirson wrote:\n> On Sat, Feb 03, 2007 at 04:29:40PM +0100, Santi Béjar wrote:\n> > diff --git a/Documentation/config.txt b/Documentation/config.txt\n> > index e5e019f..f129de9 100644\n> > --- a/Documentation/config.txt\n> > +++ b/Documentation/config.txt\n> > @@ -233,11 +233,12 @@ branch..remote::\n> > branch..merge::\n> > When in branch , it tells `git fetch` the default refspec to\n> > be marked for merging in FETCH_HEAD. The value has exactly to match\n> > - a remote part of one of the refspecs which are fetched from the remote\n> > - given by \"branch..remote\".\n> > + the remote or local part of one of the refspecs which are fetched\n> > + from the remote given by \"branch..remote\".\n>\n> Since both local and remote refs are allowed, it would be useful to\n> know how git-fetch decides how to handle them. Looks like the 1st\n> fetch refspec with that ref on either side is selected.\n\nYes, the first is selected.\n\n>\n> git-parser-remote also looks branch.*.merge with --get-all, so it is\n> interesting to know what happens for multiple values (if git-fetch\n> just marks them all, how does git-pull react ?).\n\nThe last sentence in the branch..merge says that it would\nproduce an octopus, is this enough?\n\nSanti\n"},{"id":"33454","messageId":"20070203162949.GF4266@nan92-1-81-57-214-146.fbx.proxad.net","threadId":"6638","inReplyTo":"8aa486160702030819k24a42ac4w115b83980d3ee17e@mail.gmail.com","subject":"Re: [PATCH] config.txt: update branch..merge documentation","fromName":"Yann Dirson","fromEmail":"ydirson@altern.org","sentAt":"2007-02-03T16:29:50Z","receivedAt":"2007-02-03T16:29:50Z","isPatch":true,"sender":{"key":"ydirson@altern.org","avatar":"https://avatars.githubusercontent.com/u/1190950?v=4"},"body":"On Sat, Feb 03, 2007 at 05:19:53PM +0100, Santi Béjar wrote:\n> >git-parser-remote also looks branch.*.merge with --get-all, so it is\n> >interesting to know what happens for multiple values (if git-fetch\n> >just marks them all, how does git-pull react ?).\n> \n> The last sentence in the branch..merge says that it would\n> produce an octopus, is this enough?\n\nD'oh, right.\n"},{"id":"33504","messageId":"8aa486160702031630l4fd3e29did4f249713cf2ce81@mail.gmail.com","threadId":"6638","inReplyTo":"87irejgsyj.fsf@gmail.com","subject":"Re: [PATCH] config.txt: update branch..merge documentation","fromName":"Santi Béjar","fromEmail":"sbejar@gmail.com","sentAt":"2007-02-04T00:30:02Z","receivedAt":"2007-02-04T00:30:02Z","isPatch":true,"sender":{"key":"santi@agolina.net","avatar":null},"body":"On 2/3/07, Santi Béjar wrote:\n> --- a/Documentation/config.txt\n> +++ b/Documentation/config.txt\n> @@ -233,11 +233,12 @@ branch..remote::\n> branch..merge::\n> When in branch , it tells `git fetch` the default refspec to\n> be marked for merging in FETCH_HEAD. The value has exactly to match\n> - a remote part of one of the refspecs which are fetched from the remote\n> - given by \"branch..remote\".\n> + the remote or local part of one of the refspecs which are fetched\n> + from the remote given by \"branch..remote\".\n\nIt is OK, but\n\n> The merge information is used by `git pull` (which at first calls\n> `git fetch`) to lookup the default branch for merging. Without\n> - this option, `git pull` defaults to merge the first refspec fetched.\n> + this option and when fetching a non default remote, `git pull`\n> + defaults to merge the first refspec fetched.\n> Specify multiple values to get an octopus merge.\n\n... but this is not. I interpreted it wrongly, sorry.\n\nSanti\n"},{"id":"33506","messageId":"7v4pq221vd.fsf@assigned-by-dhcp.cox.net","threadId":"6638","inReplyTo":"8aa486160702031630l4fd3e29did4f249713cf2ce81@mail.gmail.com","subject":"Re: [PATCH] config.txt: update branch..merge documentation","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2007-02-04T00:38:30Z","receivedAt":"2007-02-04T00:38:30Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Santi Béjar\" writes:\n\n> On 2/3/07, Santi Béjar wrote:\n>> --- a/Documentation/config.txt\n>> +++ b/Documentation/config.txt\n>> @@ -233,11 +233,12 @@ branch..remote::\n>> branch..merge::\n>> When in branch , it tells `git fetch` the default refspec to\n>> be marked for merging in FETCH_HEAD. The value has exactly to match\n>> - a remote part of one of the refspecs which are fetched from the remote\n>> - given by \"branch..remote\".\n>> + the remote or local part of one of the refspecs which are fetched\n>> + from the remote given by \"branch..remote\".\n>\n> It is OK, but ...\n\nYeah, but I am starting to think that it was a mistake to allow\nan additional way to express the same thing.\n\nReverting 80c797764 would make the implementation to match the\nspecification described in the original.\n"}]}