summaryrefslogtreecommitdiff
path: root/Documentation/git-rerere.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/git-rerere.txt')
-rw-r--r--Documentation/git-rerere.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt
index 9ee083c415..031f31fa47 100644
--- a/Documentation/git-rerere.txt
+++ b/Documentation/git-rerere.txt
@@ -205,7 +205,7 @@ development on the topic branch:
------------
you could run `git rebase master topic`, to bring yourself
-up-to-date before your topic is ready to be sent upstream.
+up to date before your topic is ready to be sent upstream.
This would result in falling back to a three-way merge, and it
would conflict the same way as the test merge you resolved earlier.
'git rerere' will be run by 'git rebase' to help you resolve this