| commit | c0ecb07048ce2123589a2f077d296e8cf29a9570 | |
| author | Horst H. von Brand <vonbrand@inf.utfsm.cl> | |
| Tue, 1 Dec 2009 22:44:11 +0000 (1 19:44 -0300) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 2 Dec 2009 18:42:48 +0000 (2 10:42 -0800) | ||
| tree | ec46d292ece6c4fa1a6d9f943eba2b51841f5d9d | treesnapshot (tar.gz zip) |
| parent | 0748494e866041034605aaf177f29a61bdc25951 | commitdiff |
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>
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 | diffblobblamehistory |