diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-05-14 11:43:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-14 11:43:04 -0700 |
| commit | badabc06f3f34a85a931dffa8e8d607d2ff016fc (patch) | |
| tree | a18d3b797aac88c667b5fb5a5cf79c08274d8709 /Documentation/git-rerere.txt | |
| parent | Merge branch 'ef/checkout-empty' into maint (diff) | |
| parent | docs: stop using asciidoc no-inline-literal (diff) | |
| download | tgif-badabc06f3f34a85a931dffa8e8d607d2ff016fc.tar.xz | |
Merge branch 'jk/doc-asciidoc-inline-literal' into maint
By Jeff King
* jk/doc-asciidoc-inline-literal:
docs: stop using asciidoc no-inline-literal
Diffstat (limited to 'Documentation/git-rerere.txt')
| -rw-r--r-- | Documentation/git-rerere.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt index b43b7c8c0e..a62227f84e 100644 --- a/Documentation/git-rerere.txt +++ b/Documentation/git-rerere.txt @@ -101,15 +101,15 @@ One way to do it is to pull master into the topic branch: The commits marked with `*` touch the same area in the same file; you need to resolve the conflicts when creating the commit -marked with `{plus}`. Then you can test the result to make sure your +marked with `+`. Then you can test the result to make sure your work-in-progress still works with what is in the latest master. After this test merge, there are two ways to continue your work on the topic. The easiest is to build on top of the test merge -commit `{plus}`, and when your work in the topic branch is finally +commit `+`, and when your work in the topic branch is finally ready, pull the topic branch into master, and/or ask the upstream to pull from you. By that time, however, the master or -the upstream might have been advanced since the test merge `{plus}`, +the upstream might have been advanced since the test merge `+`, in which case the final commit graph would look like this: ------------ |