git.ipfire.org Git - thirdparty/git.git/history

]> git.ipfire.org Git - thirdparty/git.git/history - merge-tree.c

projects / thirdparty / git.git / history

2007-02-25	Junio C Hamano	Merge git://repo.or.cz/git-gui into maint	blob \| commitdiff \| raw
2007-02-21	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui into...	blob \| commitdiff \| raw
2007-02-18	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk into maint	blob \| commitdiff \| raw
2007-02-13	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2007-02-13	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2007-02-12	Junio C Hamano	Merge git-gui	blob \| commitdiff \| raw
2007-01-15	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw
2007-01-14	Shawn O. Pearce	Merge branch 'master' into sp/fast-import	blob \| commitdiff \| raw
2006-11-29	Junio C Hamano	Merge master.kernel.org:/pub/scm/gitk/gitk	blob \| commitdiff \| raw
2006-11-24	Junio C Hamano	Merge branch 'jc/upload-pack'	blob \| commitdiff \| raw
2006-11-08	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw
2006-10-17	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2006-10-02	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2006-10-01	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2006-10-01	Junio C Hamano	Merge branch 'jc/gitpm'	blob \| commitdiff \| raw
2006-09-18	Junio C Hamano	Merge part of branch 'jc/upload-pack'	blob \| commitdiff \| raw
2006-09-18	Junio C Hamano	Merge branch 'jc/pack'	blob \| commitdiff \| raw
2006-09-18	Junio C Hamano	Merge branch 'jk/diff'	blob \| commitdiff \| raw
2006-09-17	Junio C Hamano	Merge branch 'jc/archive'	blob \| commitdiff \| raw
2006-09-14	Dmitry V. Levin	Handle invalid argc gently	blob \| commitdiff \| raw
2006-09-14	Dmitry V. Levin	Make count-objects, describe and merge-tree work in...	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-28	Junio C Hamano	Merge branch 'js/c-merge-recursive'	blob \| commitdiff \| raw \| diff to current
2006-08-28	Junio C Hamano	Merge branch 'jc/apply'	blob \| commitdiff \| raw \| diff to current
2006-08-26	Junio C Hamano	Merge branch 'master' into gl/web	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-21	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2006-08-17	David Rientjes	Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded...	blob \| commitdiff \| raw \| diff to current
2006-08-13	Junio C Hamano	Merge branch 'jc/upload-pack'	blob \| commitdiff \| raw \| diff to current
2006-08-13	Junio C Hamano	Merge branch 'th/diff-extra'	blob \| commitdiff \| raw \| diff to current
2006-08-13	Junio C Hamano	GIT 1.4.2 v1.4.2	blob \| commitdiff \| raw \| diff to current
2006-08-13	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2006-08-08	Junio C Hamano	Merge branch 'master' into pb/gitpm	blob \| commitdiff \| raw \| diff to current
2006-07-30	Junio C Hamano	Merge branch 'jn/make'	blob \| commitdiff \| raw \| diff to current
2006-07-26	Junio C Hamano	Merge branch 'pb/configure'	blob \| commitdiff \| raw \| diff to current
2006-07-17	Junio C Hamano	Merge branch 'sp/reflog' v1.4.2-rc1	blob \| commitdiff \| raw \| diff to current
2006-07-13	Junio C Hamano	Merge branch 'ml/trace'	blob \| commitdiff \| raw \| diff to current
2006-07-13	Junio C Hamano	Merge branch 'js/merge-base'	blob \| commitdiff \| raw \| diff to current
2006-07-13	Junio C Hamano	Merge branch 'lt/prune'	blob \| commitdiff \| raw \| diff to current
2006-07-13	Junio C Hamano	Merge branch 'lt/merge-tree'	blob \| commitdiff \| raw \| diff to current
2006-06-29	Linus Torvalds	Improved three-way blob merging code	blob \| commitdiff \| raw \| diff to current
2006-06-29	Linus Torvalds	Prepare "git-merge-tree" for future work	blob \| commitdiff \| raw \| diff to current
2006-06-18	Junio C Hamano	Merge branch 'jc/rw-prefix'	blob \| commitdiff \| raw \| diff to current
2006-06-13	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2006-06-10	Junio C Hamano	Merge git://git.kernel.org/pub/scm/git/gitweb	blob \| commitdiff \| raw \| diff to current
2006-06-07	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2006-06-04	Junio C Hamano	Merge branch 'new' of git://git.kernel.org/pub/scm...	blob \| commitdiff \| raw \| diff to current
2006-06-01	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2006-05-29	Junio C Hamano	Merge branch 'jc/dirwalk-n-cache-tree' into jc/cache...	blob \| commitdiff \| raw \| diff to current
2006-05-28	Junio C Hamano	Merge branch 'jc/cache-tree' into next	blob \| commitdiff \| raw \| diff to current
2006-05-21	Junio C Hamano	Merge branch 'master' into js/fmt-patch	blob \| commitdiff \| raw \| diff to current
2006-05-20	Junio C Hamano	Merge branch 'jc/cache-tree' into jc/dirwalk-n-cache...	blob \| commitdiff \| raw \| diff to current
2006-05-20	Junio C Hamano	Merge branch 'js/fetchconfig'	blob \| commitdiff \| raw \| diff to current
2006-05-19	Junio C Hamano	Merge part of 'js/fmt-patch' for RFC2822 dates into...	blob \| commitdiff \| raw \| diff to current
2006-05-18	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2006-05-17	Junio C Hamano	Merge branch 'jc/gitlink' into next	blob \| commitdiff \| raw \| diff to current
2006-05-17	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2006-05-16	Junio C Hamano	Merge branch 'jc/grep'	blob \| commitdiff \| raw \| diff to current
2006-05-15	Junio C Hamano	Merge branch 'jc/grep' into next	blob \| commitdiff \| raw \| diff to current
2006-05-15	Junio C Hamano	Merge branch 'fix'	blob \| commitdiff \| raw \| diff to current
2006-05-15	Junio C Hamano	Merge branch 'jc/grep' into next	blob \| commitdiff \| raw \| diff to current
2006-05-15	Junio C Hamano	Merge branch 'fix'	blob \| commitdiff \| raw \| diff to current
2006-05-14	Junio C Hamano	Merge branch 'fix'	blob \| commitdiff \| raw \| diff to current
2006-05-14	Junio C Hamano	Merge branch 'fix'	blob \| commitdiff \| raw \| diff to current
2006-05-13	Junio C Hamano	Merge branch 'lt/fix-config' into lt/config	blob \| commitdiff \| raw \| diff to current
2006-05-10	Junio C Hamano	Merge branch 'fix'	blob \| commitdiff \| raw \| diff to current
2006-05-10	Junio C Hamano	Merge branch 'jc/grep' into next	blob \| commitdiff \| raw \| diff to current
2006-05-09	Junio C Hamano	Merge branch 'mw/alternates'	blob \| commitdiff \| raw \| diff to current
2006-05-09	Junio C Hamano	Merge branch 'jc/xsha1'	blob \| commitdiff \| raw \| diff to current
2006-05-09	Junio C Hamano	Merge branch 'jc/again'	blob \| commitdiff \| raw \| diff to current
2006-05-09	Junio C Hamano	Merge branch 'np/delta'	blob \| commitdiff \| raw \| diff to current
2006-05-09	Junio C Hamano	Merge branch 'jc/bindiff'	blob \| commitdiff \| raw \| diff to current
2006-05-09	Junio C Hamano	Merge branch 'fix'	blob \| commitdiff \| raw \| diff to current
2006-05-09	Junio C Hamano	Merge branch 'jc/grep' into next	blob \| commitdiff \| raw \| diff to current
2006-05-09	Junio C Hamano	Merge branch 'tojunio' of http://locke.catalyst.net...	blob \| commitdiff \| raw \| diff to current
2006-05-08	Junio C Hamano	Merge branch 'jc/clean' into next	blob \| commitdiff \| raw \| diff to current
2006-05-08	Junio C Hamano	Merge branch 'jc/xsha1' into next	blob \| commitdiff \| raw \| diff to current
2006-05-08	Junio C Hamano	Merge branch 'jc/grep' into next	blob \| commitdiff \| raw \| diff to current
2006-05-08	Junio C Hamano	Merge branch 'fix'	blob \| commitdiff \| raw \| diff to current
2006-05-08	Dmitry V. Levin	Separate object name errors from usage errors	blob \| commitdiff \| raw \| diff to current
2006-05-07	Junio C Hamano	Merge branch 'jc/gitlink' into next	blob \| commitdiff \| raw \| diff to current
2006-05-07	Junio C Hamano	Merge branch 'jc/cache-tree' into next	blob \| commitdiff \| raw \| diff to current
2006-05-07	Junio C Hamano	Merge branch 'fix'	blob \| commitdiff \| raw \| diff to current
2006-05-07	Martin Langhoff	Merge with git://kernel.org/pub/scm/git/git.git	blob \| commitdiff \| raw \| diff to current
2006-05-06	Junio C Hamano	Merge branch 'master' into js/fmt-patch	blob \| commitdiff \| raw \| diff to current
2006-05-05	Junio C Hamano	Merge branch 'js/fmt-patch' into next	blob \| commitdiff \| raw \| diff to current
2006-05-05	Junio C Hamano	Merge branch 'fix'	blob \| commitdiff \| raw \| diff to current
2006-05-04	Junio C Hamano	Merge branch 'jc/cache-tree' into next	blob \| commitdiff \| raw \| diff to current
2006-05-04	Junio C Hamano	Merge branch 'jc/grep' into next	blob \| commitdiff \| raw \| diff to current
2006-05-04	Junio C Hamano	Merge branch 'js/fetchconfig' into next	blob \| commitdiff \| raw \| diff to current
2006-05-04	Junio C Hamano	Merge branch 'jc/logs'	blob \| commitdiff \| raw \| diff to current
2006-05-04	Junio C Hamano	Merge branch 'jc/show-branch-dense'	blob \| commitdiff \| raw \| diff to current
2006-05-04	Junio C Hamano	Merge branch 'jc/symref'	blob \| commitdiff \| raw \| diff to current
2006-05-04	Junio C Hamano	Merge branch 'jc/diff'	blob \| commitdiff \| raw \| diff to current
2006-05-04	Junio C Hamano	Merge branch 'js/repoconfig'	blob \| commitdiff \| raw \| diff to current
2006-05-04	Junio C Hamano	Merge branch 'jc/count'	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom