diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-07-09 19:54:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-09 19:54:04 -0700 |
| commit | c9f11c2b3a739e3e249b9e7711bf1ed76ef3c6db (patch) | |
| tree | 06ddfc72dff8e370e395a3acc692c8ab48147227 /git-rerere.txt | |
| parent | d0a9940c76b71c9df840a098a423d3400779d83c (diff) | |
| download | git-htmldocs-c9f11c2b3a739e3e249b9e7711bf1ed76ef3c6db.tar.gz | |
Autogenerated HTML docs for v2.22.0-428-g6d5b2
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 95763d758..4cfc88337 100644 --- a/git-rerere.txt +++ b/git-rerere.txt @@ -91,7 +91,7 @@ For such a test, you need to merge master and topic somehow. One way to do it is to pull master into the topic branch: ------------ - $ git checkout topic + $ git switch topic $ git merge master o---*---o---+ topic @@ -113,10 +113,10 @@ the upstream might have been advanced since the test merge `+`, in which case the final commit graph would look like this: ------------ - $ git checkout topic + $ git switch topic $ git merge master $ ... work on both topic and master branches - $ git checkout master + $ git switch master $ git merge topic o---*---o---+---o---o topic @@ -136,11 +136,11 @@ merges, you could blow away the test merge, and keep building on top of the tip before the test merge: ------------ - $ git checkout topic + $ git switch topic $ git merge master $ git reset --hard HEAD^ ;# rewind the test merge $ ... work on both topic and master branches - $ git checkout master + $ git switch master $ git merge topic o---*---o-------o---o topic |