| commit | 93e535a5b78c9861eca3e9371d1c3e5173c0ab02 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 24 Mar 2011 06:48:24 +0000 (23 23:48 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 24 Mar 2011 07:37:25 +0000 (24 00:37 -0700) | ||
| tree | 1466d6651b4ae358cc0fc4e141fd7dc368dcf472 | treesnapshot (tar.gz zip) |
| parent | c395c25b8642893dd1bb4be1fd124dd12f9b848c | commitdiff |
merge: merge with the default upstream branch without argument
"git merge" without specifying any commit is a no-op by default.
A new option merge.defaultupstream can be set to true to cause such an
invocation of the command to merge the upstream branches configured for
the current branch by using their last observed values stored in their
remote tracking branches.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
"git merge" without specifying any commit is a no-op by default.
A new option merge.defaultupstream can be set to true to cause such an
invocation of the command to merge the upstream branches configured for
the current branch by using their last observed values stored in their
remote tracking branches.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/git-merge.txt | diffblobblamehistory | |
| Documentation/merge-config.txt | diffblobblamehistory | |
| builtin/merge.c | diffblobblamehistory |