diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-05-19 14:26:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-19 14:26:17 -0700 |
| commit | e1b28594a7acfaa493ca0cf32e7e970dc549527a (patch) | |
| tree | 5e63878f0543693e0c35dc49d2b9a649ad32d720 /git-merge.html | |
| parent | 93f23166221e56a0b4b044f9a8b0b53aa57bc9e4 (diff) | |
| download | git-htmldocs-e1b28594a7acfaa493ca0cf32e7e970dc549527a.tar.gz | |
Autogenerated HTML docs for v2.4.1-217-g6c124
Diffstat (limited to 'git-merge.html')
| -rw-r--r-- | git-merge.html | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/git-merge.html b/git-merge.html index af2757447..416389fb6 100644 --- a/git-merge.html +++ b/git-merge.html @@ -1073,6 +1073,9 @@ commit or stash your changes before running <em>git merge</em>.</p></div> <div class="paragraph"><p>If no commit is given from the command line, merge the remote-tracking
branches that the current branch is configured to use as its upstream.
See also the configuration section of this manual page.</p></div>
+<div class="paragraph"><p>When <code>FETCH_HEAD</code> (and no other commit) is specified, the branches
+recorded in the <code>.git/FETCH_HEAD</code> file by the previous invocation
+of <code>git fetch</code> for merging are merged to the current branch.</p></div>
</dd>
</dl></div>
</div>
@@ -1839,7 +1842,7 @@ branch.<name>.mergeOptions <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2015-03-23 14:31:16 PDT
+Last updated 2015-05-19 14:25:29 PDT
</div>
</div>
</body>
|