diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-05-26 08:38:52 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-05-26 08:38:52 +0000 |
| commit | 9f10ed359a3a4153921ef654002b468cc7f8c78f (patch) | |
| tree | 710a04bf01fdd71fbb37a0e59d6086f4db4e9642 /git-merge.html | |
| parent | 7ae18250dc61b6e3620aa3fac36eac9fc0a6cd07 (diff) | |
| download | git-htmldocs-9f10ed359a3a4153921ef654002b468cc7f8c78f.tar.gz | |
Autogenerated HTML docs for v1.6.3.1-169-g33fd
Diffstat (limited to 'git-merge.html')
| -rw-r--r-- | git-merge.html | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/git-merge.html b/git-merge.html index 7807ba196..60faaa92a 100644 --- a/git-merge.html +++ b/git-merge.html @@ -434,7 +434,8 @@ new scripts. It is the same as <tt>git merge -m <msg> <remote></tt> <dd>
<p>
Produce the working tree and index state as if a real
- merge happened, but do not actually make a commit or
+ merge happened (except for the merge information),
+ but do not actually make a commit or
move the <tt>HEAD</tt>, nor record <tt>$GIT_DIR/MERGE_HEAD</tt> to
cause the next <tt>git commit</tt> command to create a merge
commit. This allows you to create a single commit on
@@ -921,7 +922,7 @@ Look at the originals. <em>git show :1:filename</em> shows the </div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-04-18 06:17:32 UTC
+Last updated 2009-05-26 08:38:35 UTC
</div>
</div>
</body>
|