Merge branch 'master' of git://repo.or.cz/git/fastimport

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 3c08a6f7db0954d2a7fea46b0309434766f73b68..9c08efa53abc2797a7b7ca0e589d83b9a4387987 100644 (file)
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -10,7 +10,7 @@ SYNOPSIS
 --------
 [verse]
 'git-merge' [-n] [--no-commit] [--squash] [-s <strategy>]...
-       -m=<msg> <remote> <remote>...
+       [-m <msg>] <remote> <remote>...
 
 DESCRIPTION
 -----------
@@ -136,7 +136,7 @@ After seeing a conflict, you can do two things:
 
  * Resolve the conflicts.  `git-diff` would report only the
    conflicting paths because of the above 2. and 3..  Edit the
-   working tree files into a desirable shape, `git-update-index`
+   working tree files into a desirable shape, `git-add` or `git-rm`
    them, to make the index file contain what the merge result
    should be, and run `git-commit` to commit the result.