path: root/Documentation/git-checkout.txt
diff options
authorShawn O. Pearce <>2007-02-17 09:43:42 (GMT)
committerJunio C Hamano <>2007-02-17 18:20:27 (GMT)
commitd7f078b8b92b1a29f9dd62c2c470fa51e15e2ffa (patch)
tree20f6c599862aaa92534de70cf76d7289e0b3aeea /Documentation/git-checkout.txt
parent5ca2db53763ed93a75de7ddbda753fc09327d7aa (diff)
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 <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'Documentation/git-checkout.txt')
1 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index e4ffde4..1ae77be 100644
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -61,7 +61,8 @@ OPTIONS
When a merge conflict happens, the index entries for conflicting
paths are left unmerged, and you need to resolve the conflicts
-and mark the resolved paths with `git update-index`.
+and mark the resolved paths with `git add` (or `git rm` if the merge
+should result in deletion of the path).
Name for the new branch.
@@ -179,11 +180,11 @@ fatal: merge program failed
At this point, `git diff` shows the changes cleanly merged as in
the previous example, as well as the changes in the conflicted
files. Edit and resolve the conflict and mark it resolved with
-`git update-index` as usual:
+`git add` as usual:
$ edit frotz
-$ git update-index frotz
+$ git add frotz