From c14261eaa297504799e3b21ecbd751edbae912c0 Mon Sep 17 00:00:00 2001 From: Nicolas Pitre Date: Sun, 14 Jan 2007 22:44:18 -0500 Subject: some doc updates 1) talk about "git merge" instead of "git pull ." 2) suggest "git repo-config" instead of directly editing config files 3) echo "URL: blah" > .git/remotes/foo is obsolete and should be "git repo-config remote.foo.url blah" 4) support for partial URL prefix has been removed (see commit ea560e6d64374ec1f6c163c276319a3da21a1345) so drop mention of it. Signed-off-by: Nicolas Pitre Signed-off-by: Junio C Hamano --- Documentation/git-rerere.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Documentation/git-rerere.txt') diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt index b57a72bdd7..08a055713c 100644 --- a/Documentation/git-rerere.txt +++ b/Documentation/git-rerere.txt @@ -81,7 +81,7 @@ One way to do it is to pull master into the topic branch: ------------ $ git checkout topic - $ git pull . master + $ git merge master o---*---o---+ topic / / @@ -103,10 +103,10 @@ in which case the final commit graph would look like this: ------------ $ git checkout topic - $ git pull . master + $ git merge master $ ... work on both topic and master branches $ git checkout master - $ git pull . topic + $ git merge topic o---*---o---+---o---o topic / / \ @@ -126,11 +126,11 @@ top of the tip before the test merge: ------------ $ git checkout topic - $ git pull . master + $ git merge master $ git reset --hard HEAD^ ;# rewind the test merge $ ... work on both topic and master branches $ git checkout master - $ git pull . topic + $ git merge topic o---*---o-------o---o topic / \ -- cgit v1.2.3