[PATCH 04/11] Use git merge instead of git pull .

2013-08-27 Thread Thomas Ackermann
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.) Signed-off-by: Thomas Ackermann th.ac...@arcor.de --- Documentation/user-manual.txt | 8 1 file changed, 4

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

2013-08-27 Thread Junio C Hamano
Thomas Ackermann th.ac...@arcor.de 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.) It does not matter that you are unaware other people use it often. I'd

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

2013-08-27 Thread Jonathan Nieder
On Tue, Aug 27, 2013 at 12:06:33PM -0700, Junio C Hamano wrote: Thomas Ackermann th.ac...@arcor.de 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.)

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

2013-08-27 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: On Tue, Aug 27, 2013 at 12:06:33PM -0700, Junio C Hamano wrote: Thomas Ackermann th.ac...@arcor.de 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