Andrew's git - gitweb.git/history

[gitweb.git] / merge-recursive.c

2006-10-19	Merge branch 'js/diff'	blob \| diff \| raw
2006-10-19	Merge branch 'jc/send-email'	blob \| diff \| raw
2006-10-19	Merge branch 'jc/grep'	blob \| diff \| raw
2006-10-19	Merge early part of branch 'jc/diff-apply-patch'	blob \| diff \| raw
2006-10-19	Merge branch 'jc/diff-numstat'	blob \| diff \| raw
2006-10-19	Merge branch 'mw/send-email'	blob \| diff \| raw
2006-10-19	Merge branch 'rs/rebase'	blob \| diff \| raw
2006-10-19	Merge branch 'sb/fetch'	blob \| diff \| raw
2006-10-19	Merge branch 'sk/svn'	blob \| diff \| raw
2006-10-19	Merge branch 'rs/zip'	blob \| diff \| raw
2006-10-17	Merge branch 'maint'	blob \| diff \| raw
2006-10-15	Merge branch 'jc/http' v1.4.3-rc3	blob \| diff \| raw
2006-10-14	Add hash_sha1_file()	blob \| diff \| raw
2006-10-02	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2006-10-01	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2006-10-01	Merge branch 'jc/gitpm'	blob \| diff \| raw \| diff to current
2006-09-18	Merge part of branch 'jc/upload-pack'	blob \| diff \| raw \| diff to current
2006-09-14	Merge branches 'maint' and 'jc/http'	blob \| diff \| raw \| diff to current
2006-09-07	Merge branch 'jc/daemon'	blob \| diff \| raw \| diff to current
2006-09-03	Merge branch 'master' into cc/trace	blob \| diff \| raw \| diff to current
2006-09-02	Replace uses of strdup with xstrdup.	blob \| diff \| raw \| diff to current
2006-09-01	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2006-08-31	Use xmalloc instead of malloc	blob \| diff \| raw \| diff to current
2006-08-28	Merge branch 'gl/web'	blob \| diff \| raw \| diff to current
2006-08-28	Merge branch 'gl/cleanup-next'	blob \| diff \| raw \| diff to current
2006-08-28	Merge branch 'js/c-merge-recursive'	blob \| diff \| raw \| diff to current
2006-08-23	hashcpy/hashcmp remaining bits.	blob \| diff \| raw \| diff to current
2006-08-23	Convert memcpy(a,b,20) to hashcpy(a,b).	blob \| diff \| raw \| diff to current
2006-08-23	Merge branch 'gl/cleanup' into gl/cleanup-next	blob \| diff \| raw \| diff to current
2006-08-13	Merge branch 'master' into js/c-merge-recursive	blob \| diff \| raw \| diff to current
2006-08-09	merge-recur: do not die unnecessarily	blob \| diff \| raw \| diff to current
2006-08-09	merge-recur: try to merge older merge bases first	blob \| diff \| raw \| diff to current
2006-08-09	merge-recur: if there is no common ancestor, fake empty one	blob \| diff \| raw \| diff to current
2006-08-09	merge-recur: do not setenv("GIT_INDEX_FILE")	blob \| diff \| raw \| diff to current
2006-08-09	merge-recur: do not call git-write-tree	blob \| diff \| raw \| diff to current
2006-08-04	merge-recursive: fix rename handling	blob \| diff \| raw \| diff to current
2006-07-31	merge-recur: virtual commits shall never be parsed	blob \| diff \| raw \| diff to current
2006-07-31	merge-recur: use the unpack_trees() interface instead...	blob \| diff \| raw \| diff to current
2006-07-31	Merge branch 'js/read-tree' into js/c-merge-recursive	blob \| diff \| raw \| diff to current
2006-07-30	merge-recur: fix thinko in unique_path()	blob \| diff \| raw \| diff to current
2006-07-28	merge-recur: Explain why sha_eq() and struct stage_data...	blob \| diff \| raw \| diff to current
2006-07-28	merge-recur: Cleanup last mixedCase variables...	blob \| diff \| raw \| diff to current
2006-07-28	merge-recur: Fix compiler warning with -pedantic	blob \| diff \| raw \| diff to current
2006-07-28	merge-recur: Remove dead code	blob \| diff \| raw \| diff to current
2006-07-28	merge-recur: Get rid of debug code	blob \| diff \| raw \| diff to current
2006-07-28	merge-recur: Convert variable names to lower_case	blob \| diff \| raw \| diff to current
2006-07-28	Cumulative update of merge-recursive in C	blob \| diff \| raw \| diff to current
2006-07-14	Merge branch 'lt/unitype' into js/c-merge-recursive	blob \| diff \| raw \| diff to current
2006-07-14	Status update on merge-recursive in C	blob \| diff \| raw \| diff to current