projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 05dd8e2) | patch
Fastpath the normal case by not checking that index matches HEAD.
authorJunio C Hamano <junkio@cox.net>
Wed, 28 Sep 2005 23:29:11 +0000 (16:29 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 28 Sep 2005 23:29:11 +0000 (16:29 -0700)
commit60fa056052b8233c22098a711ab780679d0c5b7e
tree3e0a3b493fafb907d29fefb34d8debbba8122e5ftree | snapshot
parent05dd8e2ee2ecba1b4ef1dbbde5c81281152604b4commit | diff
Fastpath the normal case by not checking that index matches HEAD.

The merge strategy would check this itself and typically does it
by using git-read-tree -m -u 3-way merge.

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