git.ipfire.org Git - thirdparty/git.git/history

]> git.ipfire.org Git - thirdparty/git.git/history - merge-recursive.c

projects / thirdparty / git.git / history

[thirdparty/git.git] / merge-recursive.c

2006-09-03	Junio C Hamano	Merge branch 'master' into cc/trace	blob \| commitdiff \| raw
2006-09-02	Shawn Pearce	Replace uses of strdup with xstrdup.	blob \| commitdiff \| raw
2006-09-01	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2006-08-31	Jonas Fonseca	Use xmalloc instead of malloc	blob \| commitdiff \| raw \| diff to current
2006-08-28	Junio C Hamano	Merge branch 'gl/web'	blob \| commitdiff \| raw \| diff to current
2006-08-28	Junio C Hamano	Merge branch 'gl/cleanup-next'	blob \| commitdiff \| raw \| diff to current
2006-08-28	Junio C Hamano	Merge branch 'js/c-merge-recursive'	blob \| commitdiff \| raw \| diff to current
2006-08-23	Junio C Hamano	hashcpy/hashcmp remaining bits.	blob \| commitdiff \| raw \| diff to current
2006-08-23	Shawn Pearce	Convert memcpy(a,b,20) to hashcpy(a,b).	blob \| commitdiff \| raw \| diff to current
2006-08-23	Junio C Hamano	Merge branch 'gl/cleanup' into gl/cleanup-next	blob \| commitdiff \| raw \| diff to current
2006-08-13	Junio C Hamano	Merge branch 'master' into js/c-merge-recursive	blob \| commitdiff \| raw \| diff to current
2006-08-09	Johannes Schindelin	merge-recur: do not die unnecessarily	blob \| commitdiff \| raw \| diff to current
2006-08-09	Johannes Schindelin	merge-recur: try to merge older merge bases first	blob \| commitdiff \| raw \| diff to current
2006-08-09	Johannes Schindelin	merge-recur: if there is no common ancestor, fake empty one	blob \| commitdiff \| raw \| diff to current
2006-08-09	Johannes Schindelin	merge-recur: do not setenv("GIT_INDEX_FILE")	blob \| commitdiff \| raw \| diff to current
2006-08-09	Johannes Schindelin	merge-recur: do not call git-write-tree	blob \| commitdiff \| raw \| diff to current
2006-08-04	Johannes Schindelin	merge-recursive: fix rename handling	blob \| commitdiff \| raw \| diff to current
2006-07-31	Johannes Schindelin	merge-recur: virtual commits shall never be parsed	blob \| commitdiff \| raw \| diff to current
2006-07-31	Johannes Schindelin	merge-recur: use the unpack_trees() interface instead...	blob \| commitdiff \| raw \| diff to current
2006-07-31	Junio C Hamano	Merge branch 'js/read-tree' into js/c-merge-recursive	blob \| commitdiff \| raw \| diff to current
2006-07-30	Johannes Schindelin	merge-recur: fix thinko in unique_path()	blob \| commitdiff \| raw \| diff to current
2006-07-28	Johannes Schindelin	merge-recur: Explain why sha_eq() and struct stage_data...	blob \| commitdiff \| raw \| diff to current
2006-07-28	Johannes Schindelin	merge-recur: Cleanup last mixedCase variables...	blob \| commitdiff \| raw \| diff to current
2006-07-28	Johannes Schindelin	merge-recur: Fix compiler warning with -pedantic	blob \| commitdiff \| raw \| diff to current
2006-07-28	Johannes Schindelin	merge-recur: Remove dead code	blob \| commitdiff \| raw \| diff to current
2006-07-28	Johannes Schindelin	merge-recur: Get rid of debug code	blob \| commitdiff \| raw \| diff to current
2006-07-28	Johannes Schindelin	merge-recur: Convert variable names to lower_case	blob \| commitdiff \| raw \| diff to current
2006-07-28	Johannes Schindelin	Cumulative update of merge-recursive in C	blob \| commitdiff \| raw \| diff to current
2006-07-14	Junio C Hamano	Merge branch 'lt/unitype' into js/c-merge-recursive	blob \| commitdiff \| raw \| diff to current
2006-07-14	Johannes Schindelin	Status update on merge-recursive in C	blob \| commitdiff \| raw \| diff to current

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom