Re: [PATCH] config.txt: update branch.<name>.merge documentation
On 2/3/07, Santi Béjar <sbejar@gmail.com> wrote:
Show 10 quoted lines
> --- a/Documentation/config.txt
> +++ b/Documentation/config.txt
> @@ -233,11 +233,12 @@ branch.<name>.remote::
> branch.<name>.merge::
> When in branch <name>, it tells `git fetch` the default refspec to
> be marked for merging in FETCH_HEAD. The value has exactly to match
> - a remote part of one of the refspecs which are fetched from the remote
> - given by "branch.<name>.remote".
> + the remote or local part of one of the refspecs which are fetched
> + from the remote given by "branch.<name>.remote".
Show 6 quoted lines
> The merge information is used by `git pull` (which at first calls
> `git fetch`) to lookup the default branch for merging. Without
> - this option, `git pull` defaults to merge the first refspec fetched.
> + this option and when fetching a non default remote, `git pull`
> + defaults to merge the first refspec fetched.
> Specify multiple values to get an octopus merge.
... but this is not. I interpreted it wrongly, sorry.
Santi