]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c395c25) | patch
merge: merge with the default upstream branch without argument
authorJunio C Hamano <gitster@pobox.com>
Thu, 24 Mar 2011 06:48:24 +0000 (23:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 24 Mar 2011 07:37:25 +0000 (00:37 -0700)
commit93e535a5b78c9861eca3e9371d1c3e5173c0ab02
tree1466d6651b4ae358cc0fc4e141fd7dc368dcf472tree | snapshot
parentc395c25b8642893dd1bb4be1fd124dd12f9b848ccommit | diff
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>
Documentation/git-merge.txt diff | blob | blame | history
Documentation/merge-config.txt diff | blob | blame | history
builtin/merge.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.