diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-09-10 17:39:23 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-10 17:39:23 +0900 |
| commit | 88bf5716b2ea27d90ae93a2f12525a0e143e3b39 (patch) | |
| tree | 0ddd74fc574f9dc6ccd7667437b0f60b5fb6a94a /git-rerere.txt | |
| parent | bc39b7db11be3ba4e93e34f706b8a774e523bf1b (diff) | |
| download | git-htmldocs-88bf5716b2ea27d90ae93a2f12525a0e143e3b39.tar.gz | |
Autogenerated HTML docs for v2.14.1-536-g68672
Diffstat (limited to 'git-rerere.txt')
| -rw-r--r-- | git-rerere.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rerere.txt b/git-rerere.txt index 9ee083c41..031f31fa4 100644 --- a/git-rerere.txt +++ b/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 |