Re: [PATCHv3] Documentation: triangular workflow

2016-06-08 Thread Matthieu Moy
Junio C Hamano writes: > * Introduction. As a summary, here are the four configuration > variables you'll be using to make it easier to arrange. I'd actually skip this, and keep configuration variable names for later. The very point of these --set-upstream & friends options is to allo

Re: [PATCHv3] Documentation: triangular workflow

2016-06-08 Thread Jordan DE GEA
> Le 7 juin 2016 à 21:12, Junio C Hamano a écrit : > > Jordan DE GEA writes: > >> + >> +- Taking the last version of the project by fetching (e.g. >> + **UPSTREAM**) > > "by fetching (e.g. UPSTREAM)" does not finish the sentence nicely. > > "... by fetching from **UPSTREAM**" would work bett

Re: [PATCHv3] Documentation: triangular workflow

2016-06-07 Thread Junio C Hamano
Jordan DE GEA writes: > diff --git a/Documentation/gitworkflows.txt b/Documentation/gitworkflows.txt > index f16c414..3b5fd09 100644 > --- a/Documentation/gitworkflows.txt > +++ b/Documentation/gitworkflows.txt > @@ -463,6 +463,156 @@ if you get conflicts: `git am -3` will use index > informatio

[PATCHv3] Documentation: triangular workflow

2016-06-07 Thread Jordan DE GEA
Currently, triangular workflow can be configured, but there is no documentation about it. A documentation is useful to keep configuration possibilities up-to-date. A new subsection is created in gitworkflow. Signed-off-by: Michael Haggerty Signed-off-by: Matthieu Moy Signed-off-by: Jordan DE GE