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

2007-05-02	Shawn O. Pearce	Merge branch 'gfi-maint' into gfi-master	blob \| commitdiff \| raw
2007-05-01	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2007-04-29	Junio C Hamano	Merge branch 'jc/attr'	blob \| commitdiff \| raw
2007-04-29	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2007-04-29	Shawn O. Pearce	Merge branch 'gfi-maint' into gfi-master	blob \| commitdiff \| raw
2007-04-27	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2007-04-26	Alex Riesen	Ignore merged status of the file-level merge	blob \| commitdiff \| raw
2007-04-26	Alex Riesen	Add a test for merging changed and rename-changed branches	blob \| commitdiff \| raw \| diff to current
2007-04-26	Alex Riesen	Avoid excessive rewrites in merge-recursive	blob \| commitdiff \| raw \| diff to current
2007-04-26	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-04-25	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-04-25	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git/fastimport	blob \| commitdiff \| raw \| diff to current
2007-04-24	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-04-22	Junio C Hamano	Merge branch 'lt/objalloc'	blob \| commitdiff \| raw \| diff to current
2007-04-22	Junio C Hamano	Merge branch 'jc/add'	blob \| commitdiff \| raw \| diff to current
2007-04-22	Junio C Hamano	Merge branch 'jc/attr'	blob \| commitdiff \| raw \| diff to current
2007-04-22	Junio C Hamano	Merge branch 'lt/gitlink'	blob \| commitdiff \| raw \| diff to current
2007-04-22	Junio C Hamano	Merge branch 'np/pack'	blob \| commitdiff \| raw \| diff to current
2007-04-22	Junio C Hamano	Merge branch 'jp/refs'	blob \| commitdiff \| raw \| diff to current
2007-04-22	Junio C Hamano	Merge branch 'jc/quickfetch'	blob \| commitdiff \| raw \| diff to current
2007-04-22	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-04-21	Junio C Hamano	Fix bogus linked-list management for user defined merge...	blob \| commitdiff \| raw \| diff to current
2007-04-20	Shawn O. Pearce	Kill the useless progress meter in merge-recursive	blob \| commitdiff \| raw \| diff to current
2007-04-20	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-04-20	Linus Torvalds	Fix working directory errno handling when unlinking...	blob \| commitdiff \| raw \| diff to current
2007-04-19	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-04-19	Junio C Hamano	Simplify code to find recursive merge driver.	blob \| commitdiff \| raw \| diff to current
2007-04-19	Junio C Hamano	Counto-fix in merge-recursive	blob \| commitdiff \| raw \| diff to current
2007-04-18	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-04-18	Junio C Hamano	Fix funny types used in attribute value representation	blob \| commitdiff \| raw \| diff to current
2007-04-18	Junio C Hamano	Allow low-level driver to specify different behaviour...	blob \| commitdiff \| raw \| diff to current
2007-04-18	Junio C Hamano	Custom low-level merge driver: change the configuration...	blob \| commitdiff \| raw \| diff to current
2007-04-18	Junio C Hamano	Allow the default low-level merge driver to be configured.	blob \| commitdiff \| raw \| diff to current
2007-04-18	Junio C Hamano	Custom low-level merge driver support.	blob \| commitdiff \| raw \| diff to current
2007-04-18	Junio C Hamano	Merge branch 'fl/cvsserver'	blob \| commitdiff \| raw \| diff to current
2007-04-18	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-04-18	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-04-18	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2007-04-18	Junio C Hamano	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| commitdiff \| raw \| diff to current
2007-04-17	Junio C Hamano	Merge branch 'jc/read-tree-df'	blob \| commitdiff \| raw \| diff to current
2007-04-17	Junio C Hamano	Allow specifying specialized merge-backend per path.	blob \| commitdiff \| raw \| diff to current
2007-04-17	Junio C Hamano	merge-recursive: separate out xdl_merge() interface.	blob \| commitdiff \| raw \| diff to current
2007-04-16	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-04-16	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-04-15	Junio C Hamano	Merge git://git2.kernel.org/pub/scm/gitk/gitk into...	blob \| commitdiff \| raw \| diff to current
2007-04-14	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-04-13	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-04-12	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-04-10	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-04-10	Junio C Hamano	merge-recursive: handle D/F conflict case more carefully.	blob \| commitdiff \| raw \| diff to current
2007-04-10	Junio C Hamano	merge-recursive: do not barf on "to be removed" entries.	blob \| commitdiff \| raw \| diff to current
2007-04-09	Junio C Hamano	Merge branch 'jc/push'	blob \| commitdiff \| raw \| diff to current
2007-04-09	Junio C Hamano	Merge branch 'jc/merge-subtree'	blob \| commitdiff \| raw \| diff to current
2007-04-09	Junio C Hamano	Merge branch 'js/fetch-progress'	blob \| commitdiff \| raw \| diff to current
2007-04-09	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-04-08	Junio C Hamano	Merge branch 'jc/read-tree-df' (early part)	blob \| commitdiff \| raw \| diff to current
2007-04-08	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-04-07	Junio C Hamano	A new merge stragety 'subtree'.	blob \| commitdiff \| raw \| diff to current
2007-04-07	Junio C Hamano	Merge branch 'jc/index-output'	blob \| commitdiff \| raw \| diff to current
2007-04-07	Junio C Hamano	Merge branch 'jc/checkout' (early part)	blob \| commitdiff \| raw \| diff to current
2007-04-07	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-04-05	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-04-05	Junio C Hamano	Fix bogus error message from merge-recursive error...	blob \| commitdiff \| raw \| diff to current
2007-04-04	Junio C Hamano	Merge branch 'jc/bisect'	blob \| commitdiff \| raw \| diff to current
2007-04-04	Junio C Hamano	Merge branch 'fl/doc'	blob \| commitdiff \| raw \| diff to current
2007-04-04	Junio C Hamano	_GIT_INDEX_OUTPUT: allow plumbing to output to an alter...	blob \| commitdiff \| raw \| diff to current
2007-04-04	Junio C Hamano	Merge 1.5.0.7 in	blob \| commitdiff \| raw \| diff to current
2007-03-31	Alex Riesen	Keep rename/rename conflicts of intermediate merges...	blob \| commitdiff \| raw \| diff to current
2007-03-30	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-03-28	Junio C Hamano	Merge branch 'maint' to synchronize with 1.5.0.6	blob \| commitdiff \| raw \| diff to current
2007-03-25	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-03-25	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-03-24	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-03-22	Junio C Hamano	Merge git://git2.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2007-03-22	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-03-20	Junio C Hamano	Merge git://git2.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2007-03-18	Junio C Hamano	Merge 1.5.0.5 in from 'maint'	blob \| commitdiff \| raw \| diff to current
2007-03-17	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-03-14	Junio C Hamano	Merge GIT 1.5.0.4	blob \| commitdiff \| raw \| diff to current
2007-03-14	Junio C Hamano	Merge branch 'jc/fetch'	blob \| commitdiff \| raw \| diff to current
2007-03-14	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-03-13	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2007-03-13	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-03-12	Shawn O. Pearce	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-03-12	Junio C Hamano	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| commitdiff \| raw \| diff to current
2007-03-12	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-03-11	Junio C Hamano	Merge branch 'js/diff-ni'	blob \| commitdiff \| raw \| diff to current
2007-03-11	Junio C Hamano	Merge branch 'js/revert-cherry'	blob \| commitdiff \| raw \| diff to current
2007-03-11	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-03-08	Junio C Hamano	Merge branch 'js/config-rename'	blob \| commitdiff \| raw \| diff to current
2007-03-07	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-03-06	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-03-06	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui into...	blob \| commitdiff \| raw \| diff to current
2007-03-06	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-03-06	Junio C Hamano	Merge branch 'master-for-junio' of git://repo.or.cz...	blob \| commitdiff \| raw \| diff to current
2007-03-05	Shawn O. Pearce	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-03-05	Junio C Hamano	Merge branch 'js/fetch-progress' (early part)	blob \| commitdiff \| raw \| diff to current
2007-03-05	Junio C Hamano	Merge branch 'js/symlink'	blob \| commitdiff \| raw \| diff to current
2007-03-05	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-03-04	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom