projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b91fb51) | patch
Revert "Use git-merge instead of git-resolve in git-pull."
authorJunio C Hamano <junkio@cox.net>
Wed, 21 Sep 2005 21:01:56 +0000 (14:01 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 21 Sep 2005 21:01:56 +0000 (14:01 -0700)
commitacfadcfb48e34fdc441e9cffbb385fce9693b363
tree2aaafd05b4c530754840d6065ea840261fc7c751tree | snapshot
parentb91fb518cc5c5f316ba149ceedff5ee194f44ebfcommit | diff
Revert "Use git-merge instead of git-resolve in git-pull."

This reverts f887564ab72e107bcdee3ba83c91e2bb4ae13ca7 commit.
git-pull.sh diff | blob | history
The core git plumbing