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-12-18	Junio C Hamano	Merge branch 'jn/web' (early part)	blob \| commitdiff \| raw
2006-12-14	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2006-12-14	Junio C Hamano	Merge branch 'jc/diff--cached'	blob \| commitdiff \| raw
2006-12-13	Junio C Hamano	Merge branch 'jc/read-tree-ignore'	blob \| commitdiff \| raw
2006-12-13	Junio C Hamano	Merge branch 'ew/rerere'	blob \| commitdiff \| raw
2006-12-13	Junio C Hamano	Merge branch 'np/addcommit'	blob \| commitdiff \| raw
2006-12-13	Junio C Hamano	Merge branch 'lh/branch-rename'	blob \| commitdiff \| raw
2006-12-13	Junio C Hamano	Merge branch 'jc/commit-careful'	blob \| commitdiff \| raw
2006-12-13	Junio C Hamano	Merge branch 'ap/clone-origin'	blob \| commitdiff \| raw
2006-12-13	Junio C Hamano	Merge branch 'jc/numstat'	blob \| commitdiff \| raw
2006-12-13	Junio C Hamano	Merge branch 'rr/cvsexportcommit'	blob \| commitdiff \| raw
2006-12-13	Junio C Hamano	Merge branch 'ap/branch'	blob \| commitdiff \| raw
2006-12-13	Junio C Hamano	Merge branch 'js/merge'	blob \| commitdiff \| raw
2006-12-13	Shawn Pearce	Remove uncontested renamed files during merge.	blob \| commitdiff \| raw \| diff to current
2006-12-13	Johannes Schindelin	merge-recursive: add/add really is modify/modify with...	blob \| commitdiff \| raw \| diff to current
2006-12-13	Junio C Hamano	Merge branch 'master' into js/merge	blob \| commitdiff \| raw \| diff to current
2006-12-11	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2006-12-11	Shawn O. Pearce	Make sure the empty tree exists when needed in merge...	blob \| commitdiff \| raw \| diff to current
2006-12-03	Junio C Hamano	merge-recursive: use xdl_merge().	blob \| commitdiff \| raw \| diff to current
2006-11-29	Junio C Hamano	Merge master.kernel.org:/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2006-11-24	Junio C Hamano	Merge branch 'jc/upload-pack'	blob \| commitdiff \| raw \| diff to current
2006-11-13	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2006-11-12	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2006-11-11	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2006-11-09	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2006-11-09	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2006-11-08	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2006-11-08	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2006-11-08	Junio C Hamano	Merge branch 'jc/pickaxe'	blob \| commitdiff \| raw \| diff to current
2006-11-07	Junio C Hamano	Merge branch 'jc/read-tree'	blob \| commitdiff \| raw \| diff to current
2006-11-07	Junio C Hamano	Merge branch 'np/index-pack'	blob \| commitdiff \| raw \| diff to current
2006-11-07	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2006-11-06	Alex Riesen	merge-recursive implicitely depends on trust_executable_bit	blob \| commitdiff \| raw \| diff to current
2006-11-01	Junio C Hamano	Merge branch 'jc/refs-and-fetch'	blob \| commitdiff \| raw \| diff to current
2006-11-01	Junio C Hamano	Merge branch 'lj/refs'	blob \| commitdiff \| raw \| diff to current
2006-10-28	Junio C Hamano	merge-recursive: adjust to loosened "working file clobb...	blob \| commitdiff \| raw \| diff to current
2006-10-28	Junio C Hamano	merge-recursive: make a few functions static.	blob \| commitdiff \| raw \| diff to current
2006-10-28	Junio C Hamano	merge-recursive: use abbreviated commit object name.	blob \| commitdiff \| raw \| diff to current
2006-10-25	Junio C Hamano	Merge branch 'aw/cvsimport'	blob \| commitdiff \| raw \| diff to current
2006-10-25	Junio C Hamano	Merge for-each-ref to sync gitweb fully with 'next'	blob \| commitdiff \| raw \| diff to current
2006-10-25	Junio C Hamano	Merge branch 'jc/web-blame'	blob \| commitdiff \| raw \| diff to current
2006-10-24	Junio C Hamano	Merge branch 'master' into jc/web	blob \| commitdiff \| raw \| diff to current
2006-10-23	Junio C Hamano	Merge branch 'np/pack'	blob \| commitdiff \| raw \| diff to current
2006-10-19	Junio C Hamano	Merge branch 'mw/pathinfo'	blob \| commitdiff \| raw \| diff to current
2006-10-19	Junio C Hamano	Merge branch 'js/diff'	blob \| commitdiff \| raw \| diff to current
2006-10-19	Junio C Hamano	Merge branch 'jc/send-email'	blob \| commitdiff \| raw \| diff to current
2006-10-19	Junio C Hamano	Merge branch 'jc/grep'	blob \| commitdiff \| raw \| diff to current
2006-10-19	Junio C Hamano	Merge early part of branch 'jc/diff-apply-patch'	blob \| commitdiff \| raw \| diff to current
2006-10-19	Junio C Hamano	Merge branch 'jc/diff-numstat'	blob \| commitdiff \| raw \| diff to current
2006-10-19	Junio C Hamano	Merge branch 'mw/send-email'	blob \| commitdiff \| raw \| diff to current
2006-10-19	Junio C Hamano	Merge branch 'rs/rebase'	blob \| commitdiff \| raw \| diff to current
2006-10-19	Junio C Hamano	Merge branch 'sb/fetch'	blob \| commitdiff \| raw \| diff to current
2006-10-19	Junio C Hamano	Merge branch 'sk/svn'	blob \| commitdiff \| raw \| diff to current
2006-10-19	Junio C Hamano	Merge branch 'rs/zip'	blob \| commitdiff \| raw \| diff to current
2006-10-17	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2006-10-15	Junio C Hamano	Merge branch 'jc/http' v1.4.3-rc3	blob \| commitdiff \| raw \| diff to current
2006-10-14	Rene Scharfe	Add hash_sha1_file()	blob \| commitdiff \| raw \| diff to current
2006-10-02	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2006-10-01	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2006-10-01	Junio C Hamano	Merge branch 'jc/gitpm'	blob \| commitdiff \| raw \| diff to current
2006-09-18	Junio C Hamano	Merge part of branch 'jc/upload-pack'	blob \| commitdiff \| raw \| diff to current
2006-09-14	Junio C Hamano	Merge branches 'maint' and 'jc/http'	blob \| commitdiff \| raw \| diff to current
2006-09-07	Junio C Hamano	Merge branch 'jc/daemon'	blob \| commitdiff \| raw \| diff to current
2006-09-03	Junio C Hamano	Merge branch 'master' into cc/trace	blob \| commitdiff \| raw \| diff to current
2006-09-02	Shawn Pearce	Replace uses of strdup with xstrdup.	blob \| commitdiff \| raw \| diff to current
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