diff options
| author | Nicolas Pitre <nico@cam.org> | 2007-01-14 22:44:18 -0500 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-01-14 21:12:14 -0800 |
| commit | c14261eaa297504799e3b21ecbd751edbae912c0 (patch) | |
| tree | 26729b99c1fdc3549bdc12aef9c3e8d55eb59983 /Documentation/git-rerere.txt | |
| parent | adb7ba6b116c0ec26e058b9b41a5a528d123323f (diff) | |
| download | git-c14261eaa297504799e3b21ecbd751edbae912c0.tar.gz | |
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 <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-rerere.txt')
| -rw-r--r-- | Documentation/git-rerere.txt | 10 |
1 files changed, 5 insertions, 5 deletions
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 / \ |