diff options
| author | Thomas Ackermann <th.acker@arcor.de> | 2013-01-21 19:17:53 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-01 21:53:33 (GMT) |
| commit | 2de9b71138171dca7279db3b3fe67e868c76d921 (patch) | |
| tree | 09cc74f510322f4f1241cd11a374490bc32d5aa3 /Documentation/git-rebase.txt | |
| parent | 48a8c26c625a4d3631c4f614bceb38933e741408 (diff) | |
| download | git-2de9b71138171dca7279db3b3fe67e868c76d921.zip git-2de9b71138171dca7279db3b3fe67e868c76d921.tar.gz git-2de9b71138171dca7279db3b3fe67e868c76d921.tar.bz2 | |
Documentation: the name of the system is 'Git', not 'git'
Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-rebase.txt')
| -rw-r--r-- | Documentation/git-rebase.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index da067ec..aca8405 100644 --- 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 |