Merge branch 'jk/cvsimport-does-not-work-with-cvsps3' into maint
[git] / merge-recursive.c
2013-02-04  Junio C HamanoMerge branch 'jk/cvsimport-does-not-work-with-cvsps3...
2013-02-04  Junio C HamanoMerge branch 'dl/am-hg-locale' into maint
2013-02-04  Junio C HamanoMerge branch 'jc/help' into maint
2013-02-04  Junio C HamanoMerge branch 'jc/merge-blobs' into maint
2013-01-30  Junio C HamanoMerge branch 'tb/t0050-maint' into maint
2013-01-29  Junio C HamanoMerge branch 'ph/rebase-preserve-all-merges' into maint
2013-01-28  Junio C HamanoMerge branch 'ss/help-htmlpath-config-doc' into maint
2013-01-28  Junio C HamanoMerge branch 'nd/attr-debug-fix' into maint
2013-01-28  Junio C HamanoMerge branch 'ds/completion-silence-in-tree-path-probe...
2013-01-28  Junio C HamanoMerge branch 'jn/maint-trim-vim-contrib' into maint
2013-01-28  Junio C HamanoMerge branch 'pe/doc-email-env-is-trumped-by-config...
2013-01-28  Junio C HamanoMerge branch 'ap/status-ignored-in-ignored-directory...
2013-01-21  Junio C HamanoMerge branch 'nz/send-email-headers-are-case-insensitiv...
2013-01-21  Junio C HamanoMerge branch 'rs/zip-with-uncompressed-size-in-the...
2013-01-14  Junio C HamanoMerge branch 'jk/maint-fast-import-doc-reorder' into...
2013-01-14  Junio C HamanoMerge branch 'jk/shortlog-no-wrap-doc' into maint
2013-01-14  Junio C HamanoMerge branch 'jk/maint-fast-import-doc-dedup-done'...
2013-01-14  Junio C HamanoMerge branch 'rs/leave-base-name-in-name-field-of-tar...
2013-01-14  Junio C HamanoMerge branch 'jl/interrupt-clone-remove-separate-git...
2013-01-14  Junio C HamanoMerge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credi...
2013-01-14  Junio C HamanoMerge branch 'jc/apply-trailing-blank-removal' into...
2013-01-14  Junio C HamanoMerge branch 'mk/maint-graph-infinity-loop' into maint
2013-01-12  Junio C HamanoMerge branch 'as/api-allocation-doc' into maint
2013-01-12  Junio C HamanoMerge branch 'os/gitweb-highlight-uncaptured' into...
2013-01-12  Junio C HamanoMerge branch 'jn/less-reconfigure' into maint
2013-01-12  Junio C HamanoMerge branch 'kb/maint-bundle-doc' into maint
2013-01-12  Junio C HamanoMerge branch 'jn/warn-on-inaccessible-loosen' into...
2013-01-10  Junio C HamanoMerge branch 'ta/remove-stale-translated-tut' into...
2013-01-10  Junio C HamanoMerge branch 'tb/test-t9020-no-which' into maint
2013-01-10  Junio C HamanoMerge branch 'jc/same-encoding' into maint
2013-01-10  Junio C HamanoMerge branch 'sp/shortlog-missing-lf' into maint
2013-01-10  Junio C HamanoMerge branch 'nd/invalidate-i-t-a-cache-tree' into...
2013-01-10  Junio C HamanoMerge branch 'jk/repack-ref-racefix' into maint
2013-01-08  Junio C HamanoMerge branch 'jc/mkstemp-more-careful-error-reporting...
2012-12-27  Junio C HamanoMerge branch 'gb/maint-doc-svn-log-window-size' into...
2012-12-27  Junio C HamanoMerge branch 'km/maint-doc-git-reset' into maint
2012-12-27  Junio C HamanoMerge branch 'tj/maint-doc-commit-sign' into maint
2012-12-23  Junio C HamanoMerge branch 'jc/doc-diff-blobs' into maint
2012-12-23  Junio C HamanoMerge branch 'nd/index-format-doc' into maint
2012-12-21  Junio C HamanoMerge branch 'jc/doc-diff-blobs'
2012-12-21  Junio C HamanoMerge branch 'nd/index-format-doc'
2012-12-18  Junio C HamanoMerge branch 'jk/pickaxe-textconv' into maint
2012-12-11  Junio C HamanoMerge branch 'ef/mingw-rmdir'
2012-12-10  Junio C HamanoWhich merge_file() function do you mean?
2012-12-07  Junio C HamanoMerge branch 'jc/same-encoding' into maint
2012-11-29  Junio C HamanoMerge branch 'jl/submodule-rm'
2012-11-28  Junio C HamanoMerge branch 'jk/pickaxe-textconv'
2012-11-28  Junio C HamanoMerge branch 'rh/maint-gitweb-highlight-ext' into maint
2012-11-28  Junio C HamanoMerge branch 'pw/maint-p4-rcs-expansion-newline' into...
2012-11-27  Junio C HamanoMerge branch 'nd/maint-compat-fnmatch-fix' into maint
2012-11-27  Junio C HamanoMerge branch 'esr/maint-doc-fast-import' into maint
2012-11-26  Junio C HamanoMerge branch 'nd/maint-compat-fnmatch-fix'
2012-11-26  Junio C HamanoMerge branch 'bc/do-not-recurse-in-die'
2012-11-26  Junio C HamanoMerge branch 'cn/config-missing-path' into maint
2012-11-26  Junio C HamanoMerge branch 'jk/maint-gitweb-xss' into maint
2012-11-21  Junio C HamanoMerge branch 'esr/maint-doc-fast-import'
2012-11-21  Junio C HamanoMerge branch 'jk/maint-http-half-auth-fetch'
2012-11-20  Junio C HamanoMerge branch 'cn/config-missing-path'
2012-11-20  Junio C HamanoMerge branch 'jl/submodule-rm'
2012-11-20  Junio C HamanoMerge branch 'jk/maint-gitweb-xss'
2012-11-20  Junio C HamanoMerge branch 'rh/maint-gitweb-highlight-ext'
2012-11-20  Junio C HamanoMerge branch 'pw/maint-p4-rcs-expansion-newline'
2012-11-20  Junio C HamanoMerge branch 'kb/preload-index-more'
2012-11-20  Junio C HamanoMerge branch 'jk/maint-http-half-auth-fetch'
2012-11-20  Junio C HamanoMerge branch 'mg/maint-pull-suggest-upstream-to' into...
2012-11-20  Junio C HamanoMerge branch 'mm/maint-doc-commit-edit' into maint
2012-11-20  Junio C HamanoMerge branch 'as/maint-doc-fix-no-post-rewrite' into...
2012-11-20  Junio C HamanoMerge branch 'rs/lock-correct-ref-during-delete' into...
2012-11-20  Junio C HamanoMerge branch 'rf/maint-mailmap-off-by-one' into maint
2012-11-20  Junio C HamanoMerge branch 'jk/maint-diff-grep-textconv' into maint
2012-11-20  Junio C HamanoMerge branch 'js/format-2047' into maint
2012-11-19  Junio C HamanoMerge branch 'sz/maint-curl-multi-timeout' into maint
2012-11-19  Junio C HamanoMerge branch 'po/maint-refs-replace-docs' into maint
2012-11-19  Junio C HamanoMerge branch 'mm/maint-doc-remote-tracking' into maint
2012-11-19  Junio C HamanoMerge branch 'nd/grep-true-path' into maint
2012-11-19  Junio C HamanoMerge branch 'da/mergetools-p4' into maint
2012-11-19  Junio C HamanoMerge branch 'jc/test-say-color-avoid-echo-escape'...
2012-11-19  Junio C HamanoMerge branch 'bw/config-lift-variable-name-length-limit...
2012-11-15  Junio C HamanoMerge branch 'mg/maint-pull-suggest-upstream-to'
2012-11-15  Junio C HamanoMerge branch 'mm/maint-doc-commit-edit'
2012-11-15  Junio C HamanoMerge branch 'as/maint-doc-fix-no-post-rewrite'
2012-11-15  Junio C HamanoMerge branch 'jc/same-encoding'
2012-11-15  Junio C HamanoMerge branch 'jk/maint-diff-grep-textconv'
2012-11-15  Junio C HamanoMerge branch 'jc/maint-fetch-tighten-refname-check'
2012-11-09  Jeff KingMerge branch 'ph/maint-submodule-status-fix'
2012-11-09  Jeff KingMerge branch 'nd/tree-walk-enum-cleanup'
2012-11-09  Jeff KingMerge branch 'sz/maint-curl-multi-timeout'
2012-11-09  Jeff KingMerge branch 'js/format-2047'
2012-11-09  Jeff KingMerge branch 'rs/lock-correct-ref-during-delete'
2012-11-09  Jeff KingMerge branch 'nd/attr-match-optim-more'
2012-11-09  Jeff KingMerge branch 'mh/maint-parse-dirstat-fix'
2012-11-04  Jeff KingMerge branch 'tj/maint-doc-commit-sign'
2012-11-04  Jeff KingMerge branch 'pp/maint-doc-pager-config'
2012-11-04  Jeff KingMerge branch 'km/maint-doc-git-reset'
2012-11-04  Jeff KingMerge branch 'tb/maint-t9200-case-insensitive'
2012-11-04  Jeff KingMerge branch 'rf/maint-mailmap-off-by-one'
2012-11-04  Jeff KingMerge branch 'gb/maint-doc-svn-log-window-size'
2012-11-04  Jeff KingMerge branch 'sz/maint-submodule-reference-arg'
2012-11-04  Jeff KingMerge branch 'sl/maint-configure-messages'
2012-11-04  Jeff KingMerge branch 'po/maint-refs-replace-docs'
next