summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-02-17 09:43:42 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-02-17 18:20:27 (GMT)
commitd7f078b8b92b1a29f9dd62c2c470fa51e15e2ffa (patch)
tree20f6c599862aaa92534de70cf76d7289e0b3aeea /Documentation/git-merge.txt
parent5ca2db53763ed93a75de7ddbda753fc09327d7aa (diff)
downloadgit-d7f078b8b92b1a29f9dd62c2c470fa51e15e2ffa.zip
git-d7f078b8b92b1a29f9dd62c2c470fa51e15e2ffa.tar.gz
git-d7f078b8b92b1a29f9dd62c2c470fa51e15e2ffa.tar.bz2
Convert update-index references in docs to add.
Since `git add` is the approved porcelain for an end-user to invoke when they want to manipulate the index, porcelain documentation should steer the user to this command rather than the pure plumbing update-index. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-merge.txt')
-rw-r--r--Documentation/git-merge.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index e53ff4b..9c08efa 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -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.