projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 0748494) | patch
git-pull.sh: Fix call to git-merge for new command format
authorHorst H. von Brand <vonbrand@inf.utfsm.cl>
Tue, 1 Dec 2009 22:44:11 +0000 (19:44 -0300)
committerJunio C Hamano <gitster@pobox.com>
Wed, 2 Dec 2009 18:42:48 +0000 (10:42 -0800)
commitc0ecb07048ce2123589a2f077d296e8cf29a9570
treeec46d292ece6c4fa1a6d9f943eba2b51841f5d9dtree | snapshot
parent0748494e866041034605aaf177f29a61bdc25951commit | diff
git-pull.sh: Fix call to git-merge for new command format

Now "git merge <msg> HEAD" is officially deprecated, we should
clean our own use as well.

Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-pull.sh diff | blob | history
Git—the stupid content tracker