diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-02-18 00:34:59 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-02-18 00:34:59 +0000 |
| commit | 89d4e0f4569738d0b1885879bf6ed88a972cd3da (patch) | |
| tree | 42b660ac1ea500caecdcdf951b7c1b3d307fa6cf /git-checkout.txt | |
| parent | fd468962039a6dcb0cd360ac60a3e7631b2b3b5d (diff) | |
| download | git-htmldocs-89d4e0f4569738d0b1885879bf6ed88a972cd3da.tar.gz | |
Autogenerated HTML docs for v1.5.0-50-gb7581
Diffstat (limited to 'git-checkout.txt')
| -rw-r--r-- | git-checkout.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/git-checkout.txt b/git-checkout.txt index e4ffde4fd..1ae77be45 100644 --- a/git-checkout.txt +++ b/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). <new_branch>:: 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 ------------ |