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

2009-02-06	Junio C Hamano	Merge branch 'js/maint-remote-remove-mirror'	blob \| commitdiff \| raw
2009-02-06	Junio C Hamano	Merge branch 'js/notes'	blob \| commitdiff \| raw
2009-02-06	Junio C Hamano	Merge branch 'maint-1.6.0' into maint	blob \| commitdiff \| raw
2009-02-06	Junio C Hamano	Merge branch 'sg/maint-gitdir-in-subdir' into maint	blob \| commitdiff \| raw
2009-02-06	Junio C Hamano	Merge branch 'lt/maint-wrap-zlib' into maint	blob \| commitdiff \| raw
2009-02-06	Junio C Hamano	Merge branch 'js/maint-all-implies-HEAD' into maint	blob \| commitdiff \| raw
2009-02-06	Junio C Hamano	Merge branch 'kc/maint-diff-bwi-fix' into maint	blob \| commitdiff \| raw
2009-02-04	Junio C Hamano	Merge branch 'maint-1.6.0' into maint	blob \| commitdiff \| raw
2009-02-04	Junio C Hamano	Merge branch 'maint-1.6.0' into maint	blob \| commitdiff \| raw
2009-02-03	Junio C Hamano	Merge branch 'maint-1.6.0' into maint	blob \| commitdiff \| raw
2009-02-01	Junio C Hamano	Merge branch 'ks/maint-mailinfo-folded'	blob \| commitdiff \| raw
2009-02-01	Junio C Hamano	Merge branch 'maint-1.6.0' into maint	blob \| commitdiff \| raw
2009-01-29	Junio C Hamano	Merge branch 'jc/maint-format-patch-o-relative' into...	blob \| commitdiff \| raw
2009-01-29	Junio C Hamano	Merge branch 'bs/maint-rename-populate-filespec' into...	blob \| commitdiff \| raw
2009-01-29	Junio C Hamano	Merge branch 'mh/maint-commit-color-status' into maint	blob \| commitdiff \| raw
2009-01-29	Junio C Hamano	Merge branch 'nd/grep-assume-unchanged' into maint	blob \| commitdiff \| raw
2009-01-29	Junio C Hamano	Merge branch 'jc/maint-ls-tree' into maint	blob \| commitdiff \| raw
2009-01-29	Junio C Hamano	Merge branch 'np/no-loosen-prune-expire-now' into maint	blob \| commitdiff \| raw
2009-01-29	Junio C Hamano	Merge branch 'mc/cd-p-pwd' into maint	blob \| commitdiff \| raw
2009-01-29	Junio C Hamano	Merge branch 'maint-1.6.0' into maint	blob \| commitdiff \| raw
2009-01-27	Junio C Hamano	Merge branch 'maint-1.6.0' into maint	blob \| commitdiff \| raw
2009-01-27	Junio C Hamano	Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into...	blob \| commitdiff \| raw
2009-01-26	Junio C Hamano	Merge branch 'js/maint-all-implies-HEAD'	blob \| commitdiff \| raw
2009-01-24	Junio C Hamano	Merge branch 'js/patience-diff'	blob \| commitdiff \| raw
2009-01-24	Junio C Hamano	Merge branch 'cb/maint-unpack-trees-absense' into maint	blob \| commitdiff \| raw
2009-01-24	Junio C Hamano	Merge branch 'tr/maint-no-index-fixes' into maint	blob \| commitdiff \| raw
2009-01-24	Junio C Hamano	Merge branch 'rs/maint-shortlog-foldline' into maint	blob \| commitdiff \| raw
2009-01-24	Junio C Hamano	Merge branch 'pj/maint-ldflags' into maint	blob \| commitdiff \| raw
2009-01-24	Junio C Hamano	Merge branch 'pb/maint-git-pm-false-dir' into maint	blob \| commitdiff \| raw
2009-01-24	Junio C Hamano	Merge branch 'js/maint-bisect-gitk' into maint	blob \| commitdiff \| raw
2009-01-24	Junio C Hamano	Merge branch 'js/add-not-submodule' into maint	blob \| commitdiff \| raw
2009-01-24	Junio C Hamano	Merge branch 'jc/maint-format-patch' into maint	blob \| commitdiff \| raw
2009-01-24	Junio C Hamano	Merge branch 'maint-1.6.0' into maint	blob \| commitdiff \| raw
2009-01-22	Junio C Hamano	Merge branch 'kc/maint-diff-bwi-fix'	blob \| commitdiff \| raw
2009-01-22	Junio C Hamano	Merge branch 'lt/maint-wrap-zlib'	blob \| commitdiff \| raw
2009-01-22	Junio C Hamano	Merge branch 'sg/maint-gitdir-in-subdir'	blob \| commitdiff \| raw
2009-01-22	Junio C Hamano	Merge branch 'jc/maint-format-patch-o-relative'	blob \| commitdiff \| raw
2009-01-21	Junio C Hamano	Merge branch 'bs/maint-rename-populate-filespec'	blob \| commitdiff \| raw
2009-01-20	Junio C Hamano	Merge branch 'kc/maint-diff-bwi-fix'	blob \| commitdiff \| raw
2009-01-18	Junio C Hamano	Merge branch 'ds/uintmax-config'	blob \| commitdiff \| raw
2009-01-18	Junio C Hamano	Merge branch 'gb/gitweb-opml'	blob \| commitdiff \| raw
2009-01-18	Junio C Hamano	Merge branch 'mv/apply-parse-opt'	blob \| commitdiff \| raw
2009-01-18	Junio C Hamano	Merge branch 'tr/rebase-root'	blob \| commitdiff \| raw
2009-01-18	Junio C Hamano	Merge branch 'gb/gitweb-patch'	blob \| commitdiff \| raw
2009-01-18	Junio C Hamano	Merge branch 'jc/maint-format-patch'	blob \| commitdiff \| raw
2009-01-18	Junio C Hamano	Merge branch 'tr/maint-no-index-fixes'	blob \| commitdiff \| raw
2009-01-18	Junio C Hamano	Merge branch 'as/autocorrect-alias'	blob \| commitdiff \| raw
2009-01-18	Junio C Hamano	Merge branch 'rs/maint-shortlog-foldline'	blob \| commitdiff \| raw
2009-01-18	Junio C Hamano	Merge branch 'mh/maint-commit-color-status'	blob \| commitdiff \| raw
2009-01-18	Junio C Hamano	Merge branch 'maint-1.6.0' into maint	blob \| commitdiff \| raw
2009-01-15	Junio C Hamano	Merge branch 'maint-1.6.0' into maint	blob \| commitdiff \| raw
2009-01-15	Junio C Hamano	Merge branch 'maint-1.6.0' into maint	blob \| commitdiff \| raw
2009-01-14	Junio C Hamano	Merge branch 'maint-1.6.0' into maint	blob \| commitdiff \| raw
2009-01-14	Junio C Hamano	Merge branch 'nd/grep-assume-unchanged'	blob \| commitdiff \| raw
2009-01-14	Junio C Hamano	Merge branch 'as/maint-shortlog-cleanup'	blob \| commitdiff \| raw
2009-01-14	Junio C Hamano	Merge branch 'jc/maint-ls-tree'	blob \| commitdiff \| raw
2009-01-14	Junio C Hamano	Merge branch 'js/bundle-tags'	blob \| commitdiff \| raw
2009-01-14	Junio C Hamano	Merge branch 'js/add-not-submodule'	blob \| commitdiff \| raw
2009-01-14	Junio C Hamano	Merge branch 'pb/maint-git-pm-false-dir'	blob \| commitdiff \| raw
2009-01-14	Junio C Hamano	Merge branch 'pj/maint-ldflags'	blob \| commitdiff \| raw
2009-01-14	Junio C Hamano	Merge branch 'fe/cvsserver'	blob \| commitdiff \| raw
2009-01-14	Junio C Hamano	Merge branch 'js/maint-bisect-gitk'	blob \| commitdiff \| raw
2009-01-14	Junio C Hamano	Merge branch 'np/no-loosen-prune-expire-now'	blob \| commitdiff \| raw
2009-01-14	Junio C Hamano	Merge branch 'cb/maint-unpack-trees-absense'	blob \| commitdiff \| raw
2009-01-14	Junio C Hamano	Merge branch 'mc/cd-p-pwd'	blob \| commitdiff \| raw
2009-01-14	Junio C Hamano	Merge branch 'mh/cherry-default'	blob \| commitdiff \| raw
2009-01-13	Junio C Hamano	Merge branch 'kk/maint-http-push' into maint	blob \| commitdiff \| raw
2009-01-13	Junio C Hamano	Merge branch 'js/maint-merge-recursive-r-d-conflict...	blob \| commitdiff \| raw
2009-01-13	Junio C Hamano	Merge branch 'cb/maint-merge-recursive-fix' into maint	blob \| commitdiff \| raw \| diff to current
2009-01-13	Junio C Hamano	Merge branch 'ap/maint-apply-modefix' into maint	blob \| commitdiff \| raw \| diff to current
2009-01-13	Junio C Hamano	Merge branch 'maint-1.6.0' into maint	blob \| commitdiff \| raw \| diff to current
2009-01-12	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2009-01-12	Junio C Hamano	Merge branch 'jc/maint-do-not-switch-to-non-commit...	blob \| commitdiff \| raw \| diff to current
2009-01-07	Junio C Hamano	Merge branch 'mh/maint-sendmail-cc-doc'	blob \| commitdiff \| raw
2009-01-07	Junio C Hamano	Merge branch 'rs/diff-ihc'	blob \| commitdiff \| raw
2009-01-07	Junio C Hamano	Merge branch 'js/maint-merge-recursive-r-d-conflict'	blob \| commitdiff \| raw
2009-01-07	Junio C Hamano	Merge branch 'mk/gitweb-feature'	blob \| commitdiff \| raw \| diff to current
2009-01-07	Junio C Hamano	Merge branch 'cb/merge-recursive-fix'	blob \| commitdiff \| raw \| diff to current
2009-01-07	Junio C Hamano	Merge branch 'wp/add-p-goto'	blob \| commitdiff \| raw \| diff to current
2009-01-07	Junio C Hamano	Merge branch 'maint-1.6.0' into maint	blob \| commitdiff \| raw \| diff to current
2009-01-03	Junio C Hamano	Merge branch 'jc/maint-do-not-switch-to-non-commit'	blob \| commitdiff \| raw \| diff to current
2009-01-03	Junio C Hamano	Merge branch 'ap/maint-apply-modefix'	blob \| commitdiff \| raw \| diff to current
2009-01-01	Junio C Hamano	Merge branch 'cb/mergetool'	blob \| commitdiff \| raw \| diff to current
2008-12-29	Junio C Hamano	Merge branch 'lt/reset-merge'	blob \| commitdiff \| raw \| diff to current
2008-12-27	Junio C Hamano	Merge branch 'sp/maint-describe-all-tag-warning' into...	blob \| commitdiff \| raw \| diff to current
2008-12-25	Johannes Schindelin	merge-recursive: mark rename/delete conflict as unmerged	blob \| commitdiff \| raw \| diff to current
2008-12-22	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-12-22	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2008-12-20	Junio C Hamano	Merge branch 'maint' to sync with GIT 1.6.0.6	blob \| commitdiff \| raw \| diff to current
2008-12-18	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-12-17	Junio C Hamano	GIT 1.5.5.6 v1.5.5.6	blob \| commitdiff \| raw
2008-12-16	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-12-15	Junio C Hamano	Merge branch 'cb/maint-merge-recursive-fix' into cb...	blob \| commitdiff \| raw \| diff to current
2008-12-13	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-12-11	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-12-10	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-12-07	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-12-06	Junio C Hamano	Merge branch 'jc/am-options'	blob \| commitdiff \| raw \| diff to current
2008-12-05	Alex Riesen	Report symlink failures in merge-recursive	blob \| commitdiff \| raw \| diff to current
2008-12-03	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