delta/git.git/git-merge-ours.sh, branch ws/curl-http-proxy-over-https github.com: git/git.git git-merge-ours: make it a builtin. 2007-11-22T22:21:59+00:00 Thomas Harning harningt@gmail.com 2007-11-22T20:19:40+00:00 a00a42ae33708caa742d9e9fbf10692cfa42f032 Except that this fixes a longstanding corner case bug by tightening the way underlying diff-index command is run, it is functionally equivalent to the scripted version. Signed-off-by: Thomas Harning Jr <harningt@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 
Except that this fixes a longstanding corner case bug by
tightening the way underlying diff-index command is run, it is
functionally equivalent to the scripted version.

Signed-off-by: Thomas Harning Jr <harningt@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Rewrite "git-frotz" to "git frotz" 2007-07-03T05:52:14+00:00 Junio C Hamano gitster@pobox.com 2007-07-03T05:52:14+00:00 5be60078c935ed08ee8eb5a32680bdfb6bb5bdf3 This uses the remove-dashes target to replace "git-frotz" to "git frotz". Signed-off-by: Junio C Hamano <gitster@pobox.com> 
This uses the remove-dashes target to replace "git-frotz" to "git frotz".

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Use diff* with --exit-code in git-am, git-rebase and git-merge-ours 2007-03-25T06:01:36+00:00 Alex Riesen raa.lkml@gmail.com 2007-03-25T00:56:13+00:00 06aff47b225506c4603a6f5ec5b4b16aa6a9d7ba This simplifies the shell code, reduces its memory footprint, and speeds things up. The performance improvements should be noticable when git-rebase works on big commits. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> 
This simplifies the shell code, reduces its memory footprint, and
speeds things up. The performance improvements should be noticable
when git-rebase works on big commits.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
git-merge-ours: make sure our index matches HEAD 2005-11-03T22:55:11+00:00 Junio C Hamano junkio@cox.net 2005-11-03T09:51:25+00:00 160252f81626d865b9e902abffe5e4976944c930 git-merge expects this check to be done appropriately by the merge strategy backends. In the case of merge-ours strategy, the resulting tree comes what we have in the index file, so it must match the current HEAD; otherwise it would not be "ours" merge. Signed-off-by: Junio C Hamano <junkio@cox.net> 
git-merge expects this check to be done appropriately by the
merge strategy backends.  In the case of merge-ours strategy,
the resulting tree comes what we have in the index file, so it
must match the current HEAD; otherwise it would not be "ours"
merge.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Add 'ours' merge strategy. 2005-11-03T22:55:10+00:00 Junio C Hamano junkio@cox.net 2005-11-02T03:34:49+00:00 64da9e604eea25c9c20cfe12618285ccd0bf3cfe This adds the coolest merge strategy ever, "ours". It can take arbitrary number of foreign heads and merge them into the current branch, with the resulting tree always taken from our branch head, hence its name. What this means is that you can declare that the current branch supersedes the development histories of other branches using this merge strategy. Signed-off-by: Junio C Hamano <junkio@cox.net> 
This adds the coolest merge strategy ever, "ours".  It can take
arbitrary number of foreign heads and merge them into the
current branch, with the resulting tree always taken from our
branch head, hence its name.

What this means is that you can declare that the current branch
supersedes the development histories of other branches using
this merge strategy.

Signed-off-by: Junio C Hamano <junkio@cox.net>