diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-02-05 21:13:21 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-05 21:13:21 -0800 |
| commit | 076ffcc834f02a4f11d7f4fe8825be3b065020ff (patch) | |
| tree | 6f5fa28df80c60c9b0a1dfab028d3db33ae22fa0 /git-rebase.txt | |
| parent | 3f2ed6f9b744f05cf2ad32b0c0c80aa149d9fdcb (diff) | |
| download | git-htmldocs-076ffcc834f02a4f11d7f4fe8825be3b065020ff.tar.gz | |
Autogenerated HTML docs for v1.8.1.2-545-g2f19ad
Diffstat (limited to 'git-rebase.txt')
| -rw-r--r-- | git-rebase.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index da067ecaf..aca840525 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -179,7 +179,7 @@ parameter can be any valid commit-ish. In case of conflict, 'git rebase' will stop at the first problematic commit and leave conflict markers in the tree. You can use 'git diff' to locate the markers (<<<<<<) and make edits to resolve the conflict. For each -file you edit, you need to tell git that the conflict has been resolved, +file you edit, you need to tell Git that the conflict has been resolved, typically this would be done with |