Andrew's git - gitweb.git/history

[gitweb.git] / merge-recursive.c

2009-02-20	Merge branch 'maint'	blob \| diff \| raw
2009-02-18	Merge branch 'maint'	blob \| diff \| raw
2009-02-15	Merge branch 'mc/setup-cd-p'	blob \| diff \| raw
2009-02-15	Merge branch 'ff/submodule-no-fetch'	blob \| diff \| raw
2009-02-15	Merge branch 'ms/mailmap'	blob \| diff \| raw
2009-02-15	Merge branch 'jn/gitweb-committag'	blob \| diff \| raw
2009-02-15	Merge branch 'rc/http-push'	blob \| diff \| raw
2009-02-12	Merge branch 'maint'	blob \| diff \| raw
2009-02-12	Merge branch 'maint-1.6.0' into maint	blob \| diff \| raw \| diff to current
2009-02-11	Merge branch 'maint'	blob \| diff \| raw
2009-02-11	Merge branch 'maint-1.5.6' into maint	blob \| diff \| raw \| diff to current
2009-02-11	Merge branch 'maint-1.5.4' into maint-1.5.5	blob \| diff \| raw
2009-02-11	Merge branch 'lh/submodule-tree-traversal' (early part)	blob \| diff \| raw
2009-02-11	Merge branch 'js/maint-1.6.0-path-normalize'	blob \| diff \| raw \| diff to current
2009-02-10	Merge branch 'maint-1.6.0' into maint	blob \| diff \| raw \| diff to current
2009-02-07	tree.c: allow read_tree_recursive() to traverse gitlink...	blob \| diff \| raw
2009-02-06	Merge branch 'js/maint-remote-remove-mirror'	blob \| diff \| raw \| diff to current
2009-02-06	Merge branch 'js/notes'	blob \| diff \| raw \| diff to current
2009-02-06	Merge branch 'maint-1.6.0' into maint	blob \| diff \| raw \| diff to current
2009-02-06	Merge branch 'sg/maint-gitdir-in-subdir' into maint	blob \| diff \| raw \| diff to current
2009-02-06	Merge branch 'lt/maint-wrap-zlib' into maint	blob \| diff \| raw \| diff to current
2009-02-06	Merge branch 'js/maint-all-implies-HEAD' into maint	blob \| diff \| raw \| diff to current
2009-02-06	Merge branch 'kc/maint-diff-bwi-fix' into maint	blob \| diff \| raw \| diff to current
2009-02-04	Merge branch 'maint-1.6.0' into maint	blob \| diff \| raw \| diff to current
2009-02-04	Merge branch 'maint-1.6.0' into maint	blob \| diff \| raw \| diff to current
2009-02-03	Merge branch 'maint-1.6.0' into maint	blob \| diff \| raw \| diff to current
2009-02-01	Merge branch 'ks/maint-mailinfo-folded'	blob \| diff \| raw \| diff to current
2009-02-01	Merge branch 'maint-1.6.0' into maint	blob \| diff \| raw \| diff to current
2009-01-29	Merge branch 'jc/maint-format-patch-o-relative' into...	blob \| diff \| raw \| diff to current
2009-01-29	Merge branch 'bs/maint-rename-populate-filespec' into...	blob \| diff \| raw \| diff to current
2009-01-29	Merge branch 'mh/maint-commit-color-status' into maint	blob \| diff \| raw \| diff to current
2009-01-29	Merge branch 'nd/grep-assume-unchanged' into maint	blob \| diff \| raw \| diff to current
2009-01-29	Merge branch 'jc/maint-ls-tree' into maint	blob \| diff \| raw \| diff to current
2009-01-29	Merge branch 'np/no-loosen-prune-expire-now' into maint	blob \| diff \| raw \| diff to current
2009-01-29	Merge branch 'mc/cd-p-pwd' into maint	blob \| diff \| raw \| diff to current
2009-01-29	Merge branch 'maint-1.6.0' into maint	blob \| diff \| raw \| diff to current
2009-01-27	Merge branch 'maint-1.6.0' into maint	blob \| diff \| raw \| diff to current
2009-01-27	Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into...	blob \| diff \| raw \| diff to current
2009-01-26	Merge branch 'js/maint-all-implies-HEAD'	blob \| diff \| raw \| diff to current
2009-01-24	Merge branch 'js/patience-diff'	blob \| diff \| raw \| diff to current
2009-01-24	Merge branch 'cb/maint-unpack-trees-absense' into maint	blob \| diff \| raw \| diff to current
2009-01-24	Merge branch 'tr/maint-no-index-fixes' into maint	blob \| diff \| raw \| diff to current
2009-01-24	Merge branch 'rs/maint-shortlog-foldline' into maint	blob \| diff \| raw \| diff to current
2009-01-24	Merge branch 'pj/maint-ldflags' into maint	blob \| diff \| raw \| diff to current
2009-01-24	Merge branch 'pb/maint-git-pm-false-dir' into maint	blob \| diff \| raw \| diff to current
2009-01-24	Merge branch 'js/maint-bisect-gitk' into maint	blob \| diff \| raw \| diff to current
2009-01-24	Merge branch 'js/add-not-submodule' into maint	blob \| diff \| raw \| diff to current
2009-01-24	Merge branch 'jc/maint-format-patch' into maint	blob \| diff \| raw \| diff to current
2009-01-24	Merge branch 'maint-1.6.0' into maint	blob \| diff \| raw \| diff to current
2009-01-22	Merge branch 'kc/maint-diff-bwi-fix'	blob \| diff \| raw \| diff to current
2009-01-22	Merge branch 'lt/maint-wrap-zlib'	blob \| diff \| raw \| diff to current
2009-01-22	Merge branch 'sg/maint-gitdir-in-subdir'	blob \| diff \| raw \| diff to current
2009-01-22	Merge branch 'jc/maint-format-patch-o-relative'	blob \| diff \| raw \| diff to current
2009-01-21	Merge branch 'bs/maint-rename-populate-filespec'	blob \| diff \| raw \| diff to current
2009-01-20	Merge branch 'kc/maint-diff-bwi-fix'	blob \| diff \| raw \| diff to current
2009-01-18	Merge branch 'ds/uintmax-config'	blob \| diff \| raw \| diff to current
2009-01-18	Merge branch 'gb/gitweb-opml'	blob \| diff \| raw \| diff to current
2009-01-18	Merge branch 'mv/apply-parse-opt'	blob \| diff \| raw \| diff to current
2009-01-18	Merge branch 'tr/rebase-root'	blob \| diff \| raw \| diff to current
2009-01-18	Merge branch 'gb/gitweb-patch'	blob \| diff \| raw \| diff to current
2009-01-18	Merge branch 'jc/maint-format-patch'	blob \| diff \| raw \| diff to current
2009-01-18	Merge branch 'tr/maint-no-index-fixes'	blob \| diff \| raw \| diff to current
2009-01-18	Merge branch 'as/autocorrect-alias'	blob \| diff \| raw \| diff to current
2009-01-18	Merge branch 'rs/maint-shortlog-foldline'	blob \| diff \| raw \| diff to current
2009-01-18	Merge branch 'mh/maint-commit-color-status'	blob \| diff \| raw \| diff to current
2009-01-18	Merge branch 'maint-1.6.0' into maint	blob \| diff \| raw \| diff to current
2009-01-15	Merge branch 'maint-1.6.0' into maint	blob \| diff \| raw \| diff to current
2009-01-15	Merge branch 'maint-1.6.0' into maint	blob \| diff \| raw \| diff to current
2009-01-14	Merge branch 'maint-1.6.0' into maint	blob \| diff \| raw \| diff to current
2009-01-14	Merge branch 'nd/grep-assume-unchanged'	blob \| diff \| raw \| diff to current
2009-01-14	Merge branch 'as/maint-shortlog-cleanup'	blob \| diff \| raw \| diff to current
2009-01-14	Merge branch 'jc/maint-ls-tree'	blob \| diff \| raw \| diff to current
2009-01-14	Merge branch 'js/bundle-tags'	blob \| diff \| raw \| diff to current
2009-01-14	Merge branch 'js/add-not-submodule'	blob \| diff \| raw \| diff to current
2009-01-14	Merge branch 'pb/maint-git-pm-false-dir'	blob \| diff \| raw \| diff to current
2009-01-14	Merge branch 'pj/maint-ldflags'	blob \| diff \| raw \| diff to current
2009-01-14	Merge branch 'fe/cvsserver'	blob \| diff \| raw \| diff to current
2009-01-14	Merge branch 'js/maint-bisect-gitk'	blob \| diff \| raw \| diff to current
2009-01-14	Merge branch 'np/no-loosen-prune-expire-now'	blob \| diff \| raw \| diff to current
2009-01-14	Merge branch 'cb/maint-unpack-trees-absense'	blob \| diff \| raw \| diff to current
2009-01-14	Merge branch 'mc/cd-p-pwd'	blob \| diff \| raw \| diff to current
2009-01-14	Merge branch 'mh/cherry-default'	blob \| diff \| raw \| diff to current
2009-01-13	Merge branch 'kk/maint-http-push' into maint	blob \| diff \| raw \| diff to current
2009-01-13	Merge branch 'js/maint-merge-recursive-r-d-conflict...	blob \| diff \| raw \| diff to current
2009-01-13	Merge branch 'cb/maint-merge-recursive-fix' into maint	blob \| diff \| raw \| diff to current
2009-01-13	Merge branch 'ap/maint-apply-modefix' into maint	blob \| diff \| raw \| diff to current
2009-01-13	Merge branch 'maint-1.6.0' into maint	blob \| diff \| raw \| diff to current
2009-01-12	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2009-01-12	Merge branch 'jc/maint-do-not-switch-to-non-commit...	blob \| diff \| raw \| diff to current
2009-01-07	Merge branch 'mh/maint-sendmail-cc-doc'	blob \| diff \| raw \| diff to current
2009-01-07	Merge branch 'rs/diff-ihc'	blob \| diff \| raw \| diff to current
2009-01-07	Merge branch 'js/maint-merge-recursive-r-d-conflict'	blob \| diff \| raw \| diff to current
2009-01-07	Merge branch 'mk/gitweb-feature'	blob \| diff \| raw \| diff to current
2009-01-07	Merge branch 'cb/merge-recursive-fix'	blob \| diff \| raw \| diff to current
2009-01-07	Merge branch 'wp/add-p-goto'	blob \| diff \| raw \| diff to current
2009-01-07	Merge branch 'maint-1.6.0' into maint	blob \| diff \| raw \| diff to current
2009-01-03	Merge branch 'jc/maint-do-not-switch-to-non-commit'	blob \| diff \| raw \| diff to current
2009-01-03	Merge branch 'ap/maint-apply-modefix'	blob \| diff \| raw \| diff to current
2009-01-01	Merge branch 'cb/mergetool'	blob \| diff \| raw \| diff to current
2008-12-29	Merge branch 'lt/reset-merge'	blob \| diff \| raw \| diff to current
next