Santi Béjar <sbejar@xxxxxxxxx> writes:
> It extracts all the information for pull from the config file.
>
> If you have a config file as:
>
> [branch "master"]
> remote=origin
> merge=next #the remote name
> octopus=octopus
> twohead=recursive
>
> When doing a "git pull" without extra parameters in the master branch
> it will fetch the origin remote repository and will merge the next
> branch (the remote name).
>
> And you can also put the equivalent of the pull.{octopus,twohead}
> options for each branch.
>
> This only changes the behavour when these keys exist and when
> git-pull is used without extra parameters.
>
> Signed-off-by: Santi Béjar <sbejar@xxxxxxxxx>
I am in general in agreement with this line of thought and had
an impression that many on the list wanted to have per-branch
configuration. I am a bit too tired now so I'd just let you
know I am interested but would not apply it tonight.
Opinions? Comments? Anything missing or objectionable on
Santi's patch from the list?
-
: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html