Make git-branch a builtin
[git] / merge-recursive.c
2006-10-02  Junio C HamanoMerge branch 'maint'
2006-10-01  Junio C HamanoMerge branch 'maint'
2006-10-01  Junio C HamanoMerge branch 'jc/gitpm'
2006-09-18  Junio C HamanoMerge part of branch 'jc/upload-pack'
2006-09-14  Junio C HamanoMerge branches 'maint' and 'jc/http'
2006-09-07  Junio C HamanoMerge branch 'jc/daemon'
2006-09-03  Junio C HamanoMerge branch 'master' into cc/trace
2006-09-02  Shawn PearceReplace uses of strdup with xstrdup.
2006-09-01  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-08-31  Jonas FonsecaUse xmalloc instead of malloc
2006-08-28  Junio C HamanoMerge branch 'gl/web'
2006-08-28  Junio C HamanoMerge branch 'gl/cleanup-next'
2006-08-28  Junio C HamanoMerge branch 'js/c-merge-recursive'
2006-08-23  Junio C Hamanohashcpy/hashcmp remaining bits.
2006-08-23  Shawn PearceConvert memcpy(a,b,20) to hashcpy(a,b).
2006-08-23  Junio C HamanoMerge branch 'gl/cleanup' into gl/cleanup-next
2006-08-13  Junio C HamanoMerge branch 'master' into js/c-merge-recursive
2006-08-09  Johannes Schindelinmerge-recur: do not die unnecessarily
2006-08-09  Johannes Schindelinmerge-recur: try to merge older merge bases first
2006-08-09  Johannes Schindelinmerge-recur: if there is no common ancestor, fake empty one
2006-08-09  Johannes Schindelinmerge-recur: do not setenv("GIT_INDEX_FILE")
2006-08-09  Johannes Schindelinmerge-recur: do not call git-write-tree
2006-08-04  Johannes Schindelinmerge-recursive: fix rename handling
2006-07-31  Johannes Schindelinmerge-recur: virtual commits shall never be parsed
2006-07-31  Johannes Schindelinmerge-recur: use the unpack_trees() interface instead...
2006-07-31  Junio C HamanoMerge branch 'js/read-tree' into js/c-merge-recursive
2006-07-30  Johannes Schindelinmerge-recur: fix thinko in unique_path()
2006-07-28  Johannes Schindelinmerge-recur: Explain why sha_eq() and struct stage_data...
2006-07-28  Johannes Schindelinmerge-recur: Cleanup last mixedCase variables...
2006-07-28  Johannes Schindelinmerge-recur: Fix compiler warning with -pedantic
2006-07-28  Johannes Schindelinmerge-recur: Remove dead code
2006-07-28  Johannes Schindelinmerge-recur: Get rid of debug code
2006-07-28  Johannes Schindelinmerge-recur: Convert variable names to lower_case
2006-07-28  Johannes SchindelinCumulative update of merge-recursive in C
2006-07-14  Junio C HamanoMerge branch 'lt/unitype' into js/c-merge-recursive
2006-07-14  Johannes SchindelinStatus update on merge-recursive in C