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-10-27	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2007-10-21	Shawn O. Pearce	Merge branch 'maint'	blob \| commitdiff \| raw
2007-10-21	Shawn O. Pearce	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw
2007-10-21	Shawn O. Pearce	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| commitdiff \| raw \| diff to current
2007-10-19	Shawn O. Pearce	Merge branch 'maint'	blob \| commitdiff \| raw
2007-10-19	Shawn O. Pearce	Merge branch 'maint'	blob \| commitdiff \| raw
2007-10-18	Shawn O. Pearce	Merge branch 'jc/am-quiet'	blob \| commitdiff \| raw
2007-10-18	Shawn O. Pearce	Merge branch 'maint'	blob \| commitdiff \| raw
2007-10-18	Shawn O. Pearce	Merge branch 'lt/diff-rename'	blob \| commitdiff \| raw
2007-10-17	Shawn O. Pearce	Merge branch 'maint'	blob \| commitdiff \| raw
2007-10-16	Shawn O. Pearce	Merge branch 'master' into db/fetch-pack	blob \| commitdiff \| raw
2007-10-16	Shawn O. Pearce	Merge branch 'maint'	blob \| commitdiff \| raw
2007-10-03	Junio C Hamano	Merge branch 'mv/unknown'	blob \| commitdiff \| raw
2007-10-03	Junio C Hamano	Merge branch 'ph/strbuf'	blob \| commitdiff \| raw
2007-10-03	Junio C Hamano	Merge branch 'lh/merge'	blob \| commitdiff \| raw \| diff to current
2007-10-03	Junio C Hamano	Merge branch 'jc/autogc'	blob \| commitdiff \| raw \| diff to current
2007-10-03	Junio C Hamano	Sync with GIT 1.5.3.4	blob \| commitdiff \| raw \| diff to current
2007-10-01	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-09-30	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-09-29	Junio C Hamano	Merge branch 'ss/svnimport'	blob \| commitdiff \| raw \| diff to current
2007-09-29	Junio C Hamano	Merge branch 'sv/svn'	blob \| commitdiff \| raw \| diff to current
2007-09-29	Junio C Hamano	Merge branch 'ml/submodule'	blob \| commitdiff \| raw \| diff to current
2007-09-29	Junio C Hamano	Merge branch 'jb/remote-rm'	blob \| commitdiff \| raw \| diff to current
2007-09-29	Junio C Hamano	Sync with GIT 1.5.3.3	blob \| commitdiff \| raw \| diff to current
2007-09-26	Carlos Rica	Move make_cache_entry() from merge-recursive.c into...	blob \| commitdiff \| raw \| diff to current
2007-09-26	Junio C Hamano	Merge branch 'jc/autogc' into js/rebase-i	blob \| commitdiff \| raw \| diff to current
2007-09-26	Lars Hjemli	Make merge-recursive honor diff.renamelimit	blob \| commitdiff \| raw \| diff to current
2007-09-25	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-09-24	Junio C Hamano	Merge branch 'jn/web'	blob \| commitdiff \| raw \| diff to current
2007-09-24	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-09-21	Pierre Habouzit	nfv?asprintf are broken without va_copy, workaround...	blob \| commitdiff \| raw \| diff to current
2007-09-19	Junio C Hamano	Merge branch 'maint' to sync with 1.5.3.2	blob \| commitdiff \| raw \| diff to current
2007-09-19	Pierre Habouzit	Use xmemdupz() in many places.	blob \| commitdiff \| raw \| diff to current
2007-09-19	Junio C Hamano	Merge branch 'master' into ph/strbuf	blob \| commitdiff \| raw \| diff to current
2007-09-19	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-09-18	Junio C Hamano	Merge branch 'cr/reset'	blob \| commitdiff \| raw \| diff to current
2007-09-18	Junio C Hamano	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| commitdiff \| raw \| diff to current
2007-09-14	Junio C Hamano	Merge branch 'jc/cachetree' into cr/reset	blob \| commitdiff \| raw \| diff to current
2007-09-12	Carlos Rica	Move make_cache_entry() from merge-recursive.c into...	blob \| commitdiff \| raw \| diff to current
2007-08-29	Junio C Hamano	Merge branch 'master' of git://git.kernel.org/pub/scm...	blob \| commitdiff \| raw \| diff to current
2007-08-27	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2007-08-26	J. Bruce Fields	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-08-21	Junio C Hamano	Merge branch 'master' of git://git.kernel.org/pub/scm...	blob \| commitdiff \| raw \| diff to current
2007-08-19	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2007-08-19	Junio C Hamano	Merge branch 'master' of git://git.kernel.org/pub/scm...	blob \| commitdiff \| raw \| diff to current
2007-08-16	Junio C Hamano	Merge branch 'maint' to sync with 1.5.2.5	blob \| commitdiff \| raw \| diff to current
2007-08-15	Luiz Fernando N...	Use xmkstemp() instead of mkstemp()	blob \| commitdiff \| raw \| diff to current
2007-08-15	Junio C Hamano	merge-recursive: do not rudely die on binary merge	blob \| commitdiff \| raw \| diff to current
2007-08-13	Junio C Hamano	Merge branch 'master' of git://git.kernel.org/pub/scm...	blob \| commitdiff \| raw \| diff to current
2007-08-11	Junio C Hamano	Merge branch 'cr/tag'	blob \| commitdiff \| raw \| diff to current
2007-08-11	Junio C Hamano	Merge branch 'jc/clone'	blob \| commitdiff \| raw \| diff to current
2007-08-10	Junio C Hamano	Merge branch 'lt/readtree'	blob \| commitdiff \| raw \| diff to current
2007-08-10	Linus Torvalds	Start moving unpack-trees to "struct tree_desc"	blob \| commitdiff \| raw \| diff to current
2007-08-06	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-08-05	J. Bruce Fields	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-08-01	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-07-30	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2007-07-28	Junio C Hamano	Merge branch 'master' of git://git.kernel.org/pub/scm...	blob \| commitdiff \| raw \| diff to current
2007-07-19	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-07-14	Junio C Hamano	Merge branch 'master' of git://git.kernel.org/pub/scm...	blob \| commitdiff \| raw \| diff to current
2007-07-12	Junio C Hamano	Merge branch 'master' of git://git.kernel.org/pub/scm...	blob \| commitdiff \| raw \| diff to current
2007-07-12	Junio C Hamano	Merge commit 'git-gui/master'	blob \| commitdiff \| raw \| diff to current
2007-07-12	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-07-12	Junio C Hamano	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| commitdiff \| raw \| diff to current
2007-07-10	Shawn O. Pearce	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-07-09	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-07-07	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-07-04	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-07-03	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-07-03	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-07-02	Junio C Hamano	Merge 1.5.2.3 in	blob \| commitdiff \| raw \| diff to current
2007-07-01	Junio C Hamano	Merge branch 'ml/worktree'	blob \| commitdiff \| raw \| diff to current
2007-07-01	Junio C Hamano	Merge branch 'ei/worktree+filter'	blob \| commitdiff \| raw \| diff to current
2007-06-30	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-06-29	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-06-29	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2007-06-29	Junio C Hamano	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| commitdiff \| raw \| diff to current
2007-06-28	Junio C Hamano	Merge branch 'master' of git://git.kernel.org/pub/scm...	blob \| commitdiff \| raw \| diff to current
2007-06-27	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-06-26	Junio C Hamano	Merge branch 'master' of git://git.kernel.org/pub/scm...	blob \| commitdiff \| raw \| diff to current
2007-06-23	Junio C Hamano	Merge branch 'jc/oneline'	blob \| commitdiff \| raw \| diff to current
2007-06-23	Junio C Hamano	Merge branch 'ei/oneline+add-empty'	blob \| commitdiff \| raw \| diff to current
2007-06-23	Junio C Hamano	Merge branch 'js/filter'	blob \| commitdiff \| raw \| diff to current
2007-06-22	Shawn O. Pearce	Import branch 'git-p4' of git://repo.or.cz/fast-export	blob \| commitdiff \| raw \| diff to current
2007-06-16	Junio C Hamano	Merge branch 'jc/remote'	blob \| commitdiff \| raw \| diff to current
2007-06-16	Junio C Hamano	Merge branch 'gp/branch'	blob \| commitdiff \| raw \| diff to current
2007-06-16	Junio C Hamano	Merge branch 'fl/cvsserver'	blob \| commitdiff \| raw \| diff to current
2007-06-16	Junio C Hamano	Merge branch 'lh/submodule'	blob \| commitdiff \| raw \| diff to current
2007-06-16	Junio C Hamano	Merge branch 'maint' to sync with GIT 1.5.2.2	blob \| commitdiff \| raw \| diff to current
2007-06-16	Johannes Schindelin	merge-recursive: refuse to merge binary files	blob \| commitdiff \| raw \| diff to current
2007-06-13	Junio C Hamano	-Wold-style-definition fix	blob \| commitdiff \| raw \| diff to current
2007-06-13	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-06-12	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-06-12	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2007-06-12	Junio C Hamano	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| commitdiff \| raw \| diff to current
2007-06-11	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2007-06-11	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-06-11	Junio C Hamano	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| commitdiff \| raw \| diff to current
2007-06-10	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-06-09	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