user manual: answer some comments from Junio
Junio left a few comments in his previous patch; deal with each of them. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
J. Bruce Fields committed
Jan 10, 2007 at 23:23 UTC
01997b4a256ed7ef96ede527a92eeeecc243a927
1 file changed
+10
-23
Documentation/user-manual.txt
+10
-23
@@ -863,17 +863,10 @@ times as you want: in order to keep track of what you want committed
863
at step 3, git maintains a snapshot of the tree's contents in a
864
special staging area called "the index."
865
866
-By default, the content of the index is identical to that of the
867
-HEAD. The command "git diff --cached" shows the difference between
868
-HEAD and the index, so you should no output from that command.
869
-
870
-////////////////////////////////////////////////
871
-
872
-This is talking about not "by default", but "when you start
873
-out". The last sentence does not parse for me...
874
-
875
-////////////////////////////////////////////////
876
-
866
+At the beginning, the content of the index will be identical to
867
+that of the HEAD. The command "git diff --cached", which shows
868
+the difference between the HEAD and the index, should therefore
869
+produce no output at that point.
870
871
Modifying the index is easy:
872
@@ -1337,20 +1330,14 @@ single mailbox file, say "patches.mbox", then run
1330
$ git am -3 patches.mbox
1331
-------------------------------------------------
1332
1340
-////////////////////////////////////////////////
1341
-
1342
-If you allow git-am to fall back to 3-way merge with -3, you
1343
-would see conflicts and "resolving a merge" techniques apply.
1344
-Otherwise "conflicts" will just fail the patch and your working
1345
-tree and index are left untouched.
1346
-
1347
-////////////////////////////////////////////////
1348
-
1333
Git will apply each patch in order; if any conflicts are found, it
1334
will stop, and you can fix the conflicts as described in
1351
-"<<resolving-a-merge,Resolving a merge>>". Once the index is updated
1352
-with the results of the conflict resolution, instead of creating a
1353
-new commit, just run
1335
+"<<resolving-a-merge,Resolving a merge>>". (The "-3" option tells
1336
+git to perform a merge; if you would prefer it just to abort and
1337
+leave your tree and index untouched, you may omit that option.)
1338
+
1339
+Once the index is updated with the results of the conflict
1340
+resolution, instead of creating a new commit, just run
1341
1342
-------------------------------------------------
1343
$ git am --resolved