Re: [PATCH 04/13] Use "git merge" instead of "git pull ."

2013-08-24 Thread Martin von Zweigbergk
On Sat, Aug 24, 2013 at 9:19 PM, Jonathan Nieder wrote: > Thomas Ackermann wrote: >> --- a/Documentation/user-manual.txt >> +++ b/Documentation/user-manual.txt >> @@ -1784,17 +1784,6 @@ repository that you pulled from. >> <>; instead, your branch will just be >> updated to point to the latest co

Re: [PATCH 04/13] Use "git merge" instead of "git pull ."

2013-08-24 Thread Jonathan Nieder
Thomas Ackermann wrote: > --- a/Documentation/user-manual.txt > +++ b/Documentation/user-manual.txt > @@ -1784,17 +1784,6 @@ repository that you pulled from. > <>; instead, your branch will just be > updated to point to the latest commit from the upstream branch.) > > -The `git pull` command ca

Re: [PATCH 04/13] Use "git merge" instead of "git pull ."

2013-08-24 Thread Junio C Hamano
Thomas Ackermann writes: > "git pull ." works, but "git merge" is the recommended > way for new users to do things. (The old description > also should have read "The former is actually *not* very > commonly used".) I think it is probably a good idea to replace "pull ." in the two later hunks wi