projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 27cfe2e) | patch
Use git-merge instead of git-resolve in git-pull.
authorJunio C Hamano <junkio@cox.net>
Sat, 17 Sep 2005 06:38:59 +0000 (23:38 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 21 Sep 2005 01:16:27 +0000 (18:16 -0700)
commitf887564ab72e107bcdee3ba83c91e2bb4ae13ca7
treeeae844ac1f369bf699f35150e6f3808a4180e55etree | snapshot
parent27cfe2e2dcbfc4f6c6288ed4eafd077e232c2ab1commit | diff
Use git-merge instead of git-resolve in git-pull.

Signed-off-by: Junio C Hamano <junkio@cox.net>
git-pull.sh diff | blob | history
The core git plumbing