Re: Understanding a recent commit in emacs-25 branch [ed19f2]

[Eli Zaretskii]

> From: Andreas Schwab <address@hidden>
> Cc: address@hidden,  address@hidden,  address@hidden,  address@hidden
> Date: Sun, 03 Apr 2016 19:35:24 +0200
> 
> Eli Zaretskii <address@hidden> writes:
> 
> >> From: Andreas Schwab <address@hidden>
> >> Cc: Ingo Lohmar <address@hidden>,  address@hidden,  address@hidden,  
> >> address@hidden
> >> Date: Sun, 03 Apr 2016 18:24:33 +0200
> >> 
> >> Eli Zaretskii <address@hidden> writes:
> >> 
> >> > But we were talking about "git pull", not about merge.
> >> 
> >> pull == fetch+merge.
> >
> > But "git help pull" != "git help fetch"+"git help merge".
> 
> What's your point?  pull has additional options.

My point is that we were talking about "git pull", and therefore the
relevant documentation is the man page of "pull", not of "merge".  The
man page of "pull" no longer warns about pulling when there are
uncommitted changes.