Re: [PATCH] config.txt: update branch.<name>.merge documentation
- From
Yann Dirson <ydirson@altern.org>
- Date
- Feb 3, 2007, 16:29 UTC
- Message-ID
- <20070203162949.GF4266@nan92-1-81-57-214-146.fbx.proxad.net>
- In-Reply-To
- <8aa486160702030819k24a42ac4w115b83980d3ee17e@mail.gmail.com>
On Sat, Feb 03, 2007 at 05:19:53PM +0100, Santi Béjar wrote:
Show 6 quoted lines
> >git-parser-remote also looks branch.*.merge with --get-all, so it is > >interesting to know what happens for multiple values (if git-fetch > >just marks them all, how does git-pull react ?). > > The last sentence in the branch.<name>.merge says that it would > produce an octopus, is this enough?
D'oh, right.