From: J. Bruce Fields Date: Thu, 11 Jan 2007 04:23:37 +0000 (-0500) Subject: user manual: answer some comments from Junio X-Git-Tag: v1.5.0-rc3~3^2~25 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=01997b4a256ed7ef96ede527a92eeeecc243a927;p=git.git 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 --- diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 7cd4dd6ab..ae21ef239 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -863,17 +863,10 @@ times as you want: in order to keep track of what you want committed at step 3, git maintains a snapshot of the tree's contents in a special staging area called "the index." -By default, the content of the index is identical to that of the -HEAD. The command "git diff --cached" shows the difference between -HEAD and the index, so you should no output from that command. - -//////////////////////////////////////////////// - -This is talking about not "by default", but "when you start -out". The last sentence does not parse for me... - -//////////////////////////////////////////////// - +At the beginning, the content of the index will be identical to +that of the HEAD. The command "git diff --cached", which shows +the difference between the HEAD and the index, should therefore +produce no output at that point. Modifying the index is easy: @@ -1337,20 +1330,14 @@ single mailbox file, say "patches.mbox", then run $ git am -3 patches.mbox ------------------------------------------------- -//////////////////////////////////////////////// - -If you allow git-am to fall back to 3-way merge with -3, you -would see conflicts and "resolving a merge" techniques apply. -Otherwise "conflicts" will just fail the patch and your working -tree and index are left untouched. - -//////////////////////////////////////////////// - Git will apply each patch in order; if any conflicts are found, it will stop, and you can fix the conflicts as described in -"<>". Once the index is updated -with the results of the conflict resolution, instead of creating a -new commit, just run +"<>". (The "-3" option tells +git to perform a merge; if you would prefer it just to abort and +leave your tree and index untouched, you may omit that option.) + +Once the index is updated with the results of the conflict +resolution, instead of creating a new commit, just run ------------------------------------------------- $ git am --resolved