Skip to main content

Browse the archive

https://github.com/git/git
31 May 2024, 23:06:24 UTC
Revision 8b944b5678efcbbbedfd555e5eef1500dc6074d1 authored by Junio C Hamano on 10 January 2007, 19:20:58 UTC, committed by Junio C Hamano on 10 January 2007, 22:45:20 UTC 
merge-recursive: do not use on-file index when not needed.
 
This revamps the merge-recursive implementation following the
outline in:

	Message-ID: <7v8xgileza.fsf@assigned-by-dhcp.cox.net>

There is no need to write out the index until the very end just
once from merge-recursive.  Also there is no need to write out
the resulting tree object for the simple case of merging with a
single merge base.

Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent f518438
Raw File
Tip revision: 8b944b5678efcbbbedfd555e5eef1500dc6074d1 authored by Junio C Hamano on 10 January 2007, 19:20:58 UTC
merge-recursive: do not use on-file index when not needed.
Tip revision: 8b944b5
ssh-push.c 
#define COUNTERPART_ENV_NAME "GIT_SSH_PULL"
#define COUNTERPART_PROGRAM_NAME "git-ssh-pull"
#define MY_PROGRAM_NAME "git-ssh-push"
#include "ssh-upload.c"
back to top