diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-01-15 06:12:45 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-01-15 06:12:45 +0000 |
| commit | edd2b0a4fa552d711bcf7561dead9c6c87146701 (patch) | |
| tree | e80c32034830f1b7e1d426c595e242567eccc386 /git-rerere.txt | |
| parent | ffaf0e26d2f1796fd1763b4a8817b8f12339bace (diff) | |
| download | git-htmldocs-edd2b0a4fa552d711bcf7561dead9c6c87146701.tar.gz | |
Autogenerated HTML docs for v1.5.0-rc1-g5fe3
Diffstat (limited to 'git-rerere.txt')
| -rw-r--r-- | git-rerere.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/git-rerere.txt b/git-rerere.txt index b57a72bdd..08a055713 100644 --- a/git-rerere.txt +++ b/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 / \ |