Documentation(tutorial): adjust merge example to the new merge world order.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Dec 7, 2005 at 16:44 UTC
361c06d8f5777c1037ad5c0e4d58f44cda4a5044
1 file changed
+12
-11
Documentation/tutorial.txt
+12
-11
@@ -1282,26 +1282,27 @@ fatal: merge program failed
1282
1283
`git-merge-one-file` script is called with parameters to
1284
describe those three versions, and is responsible to leave the
1285
-merge results in the working tree and register it in the index
1286
-file. It is a fairly straightforward shell script, and
1287
-eventually calls `merge` program from RCS suite to perform the
1285
+merge results in the working tree.
1286
+It is a fairly straightforward shell script, and
1287
+eventually calls `merge` program from RCS suite to perform a
1288
file-level 3-way merge. In this case, `merge` detects
1289
conflicts, and the merge result with conflict marks is left in
1290
-the working tree, while the index file is updated with the
1291
-version from the current branch (this is to make `git diff`
1292
-useful after this step). This can be seen if you run `ls-files
1290
+the working tree.. This can be seen if you run `ls-files
1291
--stage` again at this point:
1292
1293
------------
1294
$ git-ls-files --stage
1295
100644 7f8b141b65fdcee47321e399a2598a235a032422 0 example
1298
-100644 06fa6a24256dc7e560efa5687fa84b51f0263c3a 0 hello
1296
+100644 263414f423d0e4d70dae8fe53fa34614ff3e2860 1 hello
1297
+100644 06fa6a24256dc7e560efa5687fa84b51f0263c3a 2 hello
1298
+100644 cc44c73eb783565da5831b4d820c962954019b69 3 hello
1299
------------
1300
1301
-As you can see, there is no unmerged paths in the index file.
1301
This is the state of the index file and the working file after
1302
`git merge` returns control back to you, leaving the conflicting
1304
-merge for you to resolve.
1303
+merge for you to resolve. Notice that the path `hello` is still
1304
+unmerged, and what you see with `git diff` at this point is
1305
+differences since stage 2 (i.e. your version).
1306
1307
1308
Publishing your work
@@ -1675,10 +1676,10 @@ Bundling your work together
1676
---------------------------
1677
1678
It is likely that you will be working on more than one thing at
1678
-a time. It is easy to use those more-or-less independent tasks
1679
+a time. It is easy to manage those more-or-less independent tasks
1680
using branches with git.
1681
1681
-We have already seen how branches work in a previous example,
1682
+We have already seen how branches work previously,
1683
with "fun and work" example using two branches. The idea is the
1684
same if there are more than two branches. Let's say you started
1685
out from "master" head, and have some new code in the "master"