On Wed, Mar 20, 2013 at 8:45 PM, Ramkumar Ramachandra <artagnon@xxxxxxxxx> wrote: > This new configuration variable overrides `remote.pushdefault` and > `branch.<name>.remote` for pushes. In a typical triangular-workflow > setup, you would want to set `remote.pushdefault` to specify the > remote to push to for all branches, and use this option to override it > for a specific branch. > > Signed-off-by: Ramkumar Ramachandra <artagnon@xxxxxxxxx> > --- > Documentation/config.txt | 18 ++++++++++++++---- > remote.c | 3 +++ > t/t5516-fetch-push.sh | 15 +++++++++++++++ > 3 files changed, 32 insertions(+), 4 deletions(-) Shouldn't this patch be squashed into 5/6 because of... > diff --git a/Documentation/config.txt b/Documentation/config.txt > index e813c33..4b9647a 100644 > --- a/Documentation/config.txt > +++ b/Documentation/config.txt > @@ -726,9 +726,18 @@ branch.<name>.remote:: > When on branch <name>, it tells 'git fetch' and 'git push' > which remote to fetch from/push to. The remote to push to > may be overridden with `remote.pushdefault` (for all branches). > - If no remote is configured, or if you are not on any branch, > - it defaults to `origin` for fetching and `remote.pushdefault` > - for pushing. > + The remote to push to, for the current branch, may be further > + overridden by `branch.<name>.pushremote`. If no remote is > + configured, or if you are not on any branch, it defaults to > + `origin` for fetching and `remote.pushdefault` for pushing. > + ...this? (Since this description was introduced in 5/6) -- Cheers, Ray Chuan -- To unsubscribe from this 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