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