diff options
author | Junio C Hamano <junkio@cox.net> | 2005-09-28 16:29:11 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2005-09-28 16:29:11 -0700 |
commit | 60fa056052b8233c22098a711ab780679d0c5b7e (patch) | |
tree | 3e0a3b493fafb907d29fefb34d8debbba8122e5f /.gitignore | |
parent | 05dd8e2ee2ecba1b4ef1dbbde5c81281152604b4 (diff) | |
download | git-60fa056052b8233c22098a711ab780679d0c5b7e.tar.gz git-60fa056052b8233c22098a711ab780679d0c5b7e.tar.xz |
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>
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions