Re: [PATCH 03/16] pull: cleanup documentation

2013-11-01 Thread Felipe Contreras
On Fri, Nov 1, 2013 at 5:05 AM, SZEDER Gábor wrote: > On Thu, Oct 31, 2013 at 09:50:51PM -0600, Felipe Contreras wrote: >> On Thu, Oct 31, 2013 at 8:48 PM, David Aguilar wrote: >> > On Thu, Oct 31, 2013 at 07:56:03PM -0600, Felipe Contreras wrote: >> >> >> Nobody is forcing you to read them. >> >

Re: [PATCH 03/16] pull: cleanup documentation

2013-11-01 Thread SZEDER Gábor
On Thu, Oct 31, 2013 at 09:50:51PM -0600, Felipe Contreras wrote: > On Thu, Oct 31, 2013 at 8:48 PM, David Aguilar wrote: > > On Thu, Oct 31, 2013 at 07:56:03PM -0600, Felipe Contreras wrote: > > >> Nobody is forcing you to read them. > > > > You're missing the *key* point. > > No one wants to in

Re: [PATCH 03/16] pull: cleanup documentation

2013-10-31 Thread Felipe Contreras
On Thu, Oct 31, 2013 at 8:48 PM, David Aguilar wrote: > On Thu, Oct 31, 2013 at 07:56:03PM -0600, Felipe Contreras wrote: >> Nobody is forcing you to read them. > > You're missing the *key* point. > No one wants to interact with a rude arrogant loudmouth. Then don't. Problem solved. -- Felipe

Re: [PATCH 03/16] pull: cleanup documentation

2013-10-31 Thread David Aguilar
On Thu, Oct 31, 2013 at 07:56:03PM -0600, Felipe Contreras wrote: > On Thu, Oct 31, 2013 at 5:40 PM, David Aguilar wrote: > > On Thu, Oct 31, 2013 at 03:16:57PM -0600, Felipe Contreras wrote: > >> On Thu, Oct 31, 2013 at 2:43 PM, Junio C Hamano wrote: > >> > Junio C Hamano writes: > >> > >> > Th

Re: [PATCH 03/16] pull: cleanup documentation

2013-10-31 Thread Felipe Contreras
On Thu, Oct 31, 2013 at 5:40 PM, David Aguilar wrote: > On Thu, Oct 31, 2013 at 03:16:57PM -0600, Felipe Contreras wrote: >> On Thu, Oct 31, 2013 at 2:43 PM, Junio C Hamano wrote: >> > Junio C Hamano writes: >> >> > The other reason the original did not say "origin/master" is because >> > this h

Re: [PATCH 03/16] pull: cleanup documentation

2013-10-31 Thread David Aguilar
On Thu, Oct 31, 2013 at 03:16:57PM -0600, Felipe Contreras wrote: > On Thu, Oct 31, 2013 at 2:43 PM, Junio C Hamano wrote: > > Junio C Hamano writes: > > > The other reason the original did not say "origin/master" is because > > this holds true even if you do not have such a remote-tracking > >

Re: [PATCH 03/16] pull: cleanup documentation

2013-10-31 Thread Felipe Contreras
On Thu, Oct 31, 2013 at 2:43 PM, Junio C Hamano wrote: > Junio C Hamano writes: > The other reason the original did not say "origin/master" is because > this holds true even if you do not have such a remote-tracking > branch for the master at the origin, but the illustration that shows > the his

Re: [PATCH 03/16] pull: cleanup documentation

2013-10-31 Thread Felipe Contreras
On Thu, Oct 31, 2013 at 2:27 PM, Junio C Hamano wrote: > Felipe Contreras writes: > >> On Thu, Oct 31, 2013 at 1:00 PM, Junio C Hamano wrote: >>> Felipe Contreras writes: >>> On Thu, Oct 31, 2013 at 12:11 PM, Junio C Hamano wrote: > Felipe Contreras writes: >> --- a/Document

Re: [PATCH 03/16] pull: cleanup documentation

2013-10-31 Thread Junio C Hamano
Junio C Hamano writes: > Max Horn writes: > >>> ... The "reality" is more like this: >>> >>> origin/master in your repository >>> | >>> v >>> A---B---C master at origin >>> / >>>D---E---F---G master in your repository >>> >>> if you really want to write origin/maste

Re: [PATCH 03/16] pull: cleanup documentation

2013-10-31 Thread Junio C Hamano
Felipe Contreras writes: > On Thu, Oct 31, 2013 at 1:00 PM, Junio C Hamano wrote: >> Felipe Contreras writes: >> >>> On Thu, Oct 31, 2013 at 12:11 PM, Junio C Hamano wrote: Felipe Contreras writes: >>> > --- a/Documentation/git-pull.txt > +++ b/Documentation/git-pull.txt > @@

Re: [PATCH 03/16] pull: cleanup documentation

2013-10-31 Thread Felipe Contreras
On Thu, Oct 31, 2013 at 1:00 PM, Junio C Hamano wrote: > Felipe Contreras writes: > >> On Thu, Oct 31, 2013 at 12:11 PM, Junio C Hamano wrote: >>> Felipe Contreras writes: >> --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -39,7 +39,7 @@ Assume the following

Re: [PATCH 03/16] pull: cleanup documentation

2013-10-31 Thread Junio C Hamano
Max Horn writes: >> ... The "reality" is more like this: >> >> origin/master in your repository >> | >> v >> A---B---C master at origin >> / >>D---E---F---G master in your repository >> >> if you really want to write origin/master somewhere in this >> illustration. >

Re: [PATCH 03/16] pull: cleanup documentation

2013-10-31 Thread Max Horn
On 31.10.2013, at 20:00, Junio C Hamano wrote: > Felipe Contreras writes: [...] > >> >> If you want to be pedantic, this is the "reality": >> >> >> D---E---F---G master >> > > You are wrong again. The "reality" is more like this: > > origin/master i

Re: [PATCH 03/16] pull: cleanup documentation

2013-10-31 Thread Junio C Hamano
Felipe Contreras writes: > On Thu, Oct 31, 2013 at 12:11 PM, Junio C Hamano wrote: >> Felipe Contreras writes: > >>> --- a/Documentation/git-pull.txt >>> +++ b/Documentation/git-pull.txt >>> @@ -39,7 +39,7 @@ Assume the following history exists and the current >>> branch is >>> "`master`": >>

Re: [PATCH 03/16] pull: cleanup documentation

2013-10-31 Thread Felipe Contreras
On Thu, Oct 31, 2013 at 12:11 PM, Junio C Hamano wrote: > Felipe Contreras writes: >> --- a/Documentation/git-pull.txt >> +++ b/Documentation/git-pull.txt >> @@ -39,7 +39,7 @@ Assume the following history exists and the current branch >> is >> "`master`": >> >> >> - A---B--

Re: [PATCH 03/16] pull: cleanup documentation

2013-10-31 Thread Junio C Hamano
Felipe Contreras writes: > 'origin/master' is very clear, no need to specify the 'remotes/' prefix, > or babysit the user. > > Signed-off-by: Felipe Contreras > --- > Documentation/git-pull.txt | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/Documentation/git-pull.t

[PATCH 03/16] pull: cleanup documentation

2013-10-31 Thread Felipe Contreras
'origin/master' is very clear, no need to specify the 'remotes/' prefix, or babysit the user. Signed-off-by: Felipe Contreras --- Documentation/git-pull.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index beea1