rev-parse: add --prefix option

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index da067ecafa37cfc18ed42c971cd62da2c8571931..aca840525eee7bb3743baf7f72d8c0f240ff1b60 100644 (file)
--- a/Documentation/git-rebase.txt
+++ b/Documentation/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