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.txt | |
| parent | 93f23166221e56a0b4b044f9a8b0b53aa57bc9e4 (diff) | |
| download | git-htmldocs-e1b28594a7acfaa493ca0cf32e7e970dc549527a.tar.gz | |
Autogenerated HTML docs for v2.4.1-217-g6c124
Diffstat (limited to 'git-merge.txt')
| -rw-r--r-- | git-merge.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/git-merge.txt b/git-merge.txt index 1f94908e3..273a1009b 100644 --- a/git-merge.txt +++ b/git-merge.txt @@ -104,6 +104,10 @@ commit or stash your changes before running 'git merge'. 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. ++ +When `FETCH_HEAD` (and no other commit) is specified, the branches +recorded in the `.git/FETCH_HEAD` file by the previous invocation +of `git fetch` for merging are merged to the current branch. PRE-MERGE CHECKS |