diff options
Diffstat (limited to 'Documentation/git-merge.txt')
| -rw-r--r-- | Documentation/git-merge.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 04c21d33cf..c88bebe367 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -22,7 +22,7 @@ The second syntax (<msg> `HEAD` <commit>...) is supported for historical reasons. Do not use it from the command line or in new scripts. It is the same as `git merge -m <msg> <commit>...`. -*Warning*: Running 'git-merge' with uncommitted changes is +*Warning*: Running 'git merge' with uncommitted changes is discouraged: while possible, it leaves you in a state that is hard to back out of in the case of a conflict. @@ -46,7 +46,7 @@ include::merge-strategies.txt[] If you tried a merge which resulted in complex conflicts and -want to start over, you can recover with 'git-reset'. +want to start over, you can recover with 'git reset'. CONFIGURATION ------------- @@ -198,7 +198,7 @@ After seeing a conflict, you can do two things: * Resolve the conflicts. Git will mark the conflicts in the working tree. Edit the files into shape and - 'git-add' them to the index. Use 'git-commit' to seal the deal. + 'git add' them to the index. Use 'git commit' to seal the deal. You can work through the conflict with a number of tools: |