]> git.ipfire.org Git - thirdparty/git.git/history - xdiff/xprepare.c
Merge branch 'hv/submodule-update-nuke-submodules' into maint
[thirdparty/git.git] / xdiff / xprepare.c
2012-07-11  Junio C HamanoMerge branch 'mm/verify-filename-fix' into maint
2012-07-11  Junio C HamanoMerge branch 'cn/cherry-pick-range-docs' into maint
2012-07-11  Junio C HamanoMerge branch 'jc/ls-files-i-dir' into maint
2012-06-17  Junio C HamanoMerge branch 'js/maint-fast-export-mark-error' into...
2012-06-12  Junio C HamanoMerge branch 'jc/fmt-merge-msg-people'
2012-06-12  Junio C HamanoMerge branch 'js/maint-fast-export-mark-error'
2012-06-07  Junio C HamanoMerge branch 'rr/maint-t3510-cascade-fix'
2012-06-03  Junio C HamanoMerge branch 'ef/maint-rebase-error-message' into maint
2012-06-01  Junio C HamanoMerge branch 'ef/maint-rebase-error-message'
2012-06-01  Junio C HamanoMerge branch 'nh/empty-rebase'
2012-06-01  Junio C HamanoMerge branch 'ef/http-o-depends-on-gvf' into maint
2012-06-01  Junio C HamanoMerge branch 'rs/maint-grep-F' into maint
2012-06-01  Junio C HamanoMerge branch 'jk/ident-split-fix' into maint
2012-06-01  Junio C HamanoMerge branch 'jk/pretty-commit-header-incomplete-line...
2012-06-01  Junio C HamanoMerge branch 'jk/format-person-part-buffer-limit' into...
2012-05-29  Junio C HamanoMerge branch 'va/git-p4-test'
2012-05-29  Junio C HamanoMerge branch 'mh/fetch-pack-constness'
2012-05-25  Junio C HamanoMerge branch 'sp/sh-windows-pwd'
2012-05-25  Junio C HamanoMerge branch 'mh/test-keep-prove-cache'
2012-05-25  Junio C HamanoMerge branch 'jk/format-person-part-buffer-limit'
2012-05-25  Junio C HamanoMerge branch 'jk/pretty-commit-header-incomplete-line'
2012-05-25  Junio C HamanoMerge branch 'jk/ident-split-fix'
2012-05-25  Junio C HamanoMerge branch 'rs/xdiff-fast-hash-fix'
2012-05-25  Junio C HamanoMerge branch 'mh/ref-api'
2012-05-25  Junio C HamanoMerge branch 'rs/maint-grep-F'
2012-05-25  Junio C HamanoMerge branch 'hv/submodule-alt-odb' into maint
2012-05-25  Junio C HamanoMerge branch 'bp/diff-no-index-strbuf-fix' into maint
2012-05-25  Junio C HamanoMerge branch 'jk/maint-status-porcelain-z-b' into maint
2012-05-23  Junio C HamanoMerge branch 'rs/archive-tree-in-tip-simplify'
2012-05-23  Junio C HamanoMerge branch 'js/rev-parse-doc-fix'
2012-05-23  Junio C HamanoMerge branch 'js/rebase-i-p-test-fix'
2012-05-23  Junio C HamanoMerge branch 'bp/diff-no-index-strbuf-fix'
2012-05-23  Junio C HamanoMerge branch 'hv/submodule-alt-odb'
2012-05-17  Junio C HamanoMerge branch 'ld/git-p4-tags-and-labels'
2012-05-14  Junio C HamanoMerge branch 'fc/simplify-complete-revlist-file'
2012-05-14  Junio C HamanoMerge branch 'nd/threaded-index-pack'
2012-05-14  Junio C HamanoMerge branch 'maint' of git://github.com/git-l10n/git...
2012-05-14  Junio C HamanoMerge branch 'jk/maint-reflog-walk-count-vs-time' into...
2012-05-14  Junio C HamanoMerge branch 'jk/doc-asciidoc-inline-literal' into...
2012-05-14  Junio C HamanoMerge branch 'ef/checkout-empty' into maint
2012-05-14  Junio C HamanoMerge branch 'jk/maint-tformat-with-z' into maint
2012-05-14  Junio C HamanoMerge branch 'js/checkout-detach-count' into maint
2012-05-14  Junio C HamanoMerge branch 'ef/maint-clone-progress-fix' into maint
2012-05-12  Jiang XinMerge branch 'maint'
2012-05-11  Junio C HamanoMerge branch 'ef/checkout-empty'
2012-05-11  Junio C HamanoMerge branch 'jk/maint-reflog-walk-count-vs-time'
2012-05-11  Junio C HamanoMerge branch 'jc/diff-algo-cleanup' into maint
2012-05-11  Junio C HamanoMerge branch 'ah/maint-grep-double-init' into maint
2012-05-11  Junio C HamanoMerge branch 'fa/maint-config-doc' into maint
2012-05-10  Junio C HamanoMerge branch 'fa/maint-config-doc'
2012-05-10  Junio C HamanoMerge branch 'ef/maint-clone-progress-fix'
2012-05-10  Junio C HamanoMerge branch 'ah/maint-grep-double-init'
2012-05-10  Junio C HamanoMerge branch 'js/checkout-detach-count'
2012-05-10  Junio C HamanoMerge branch 'jc/install-no-hardlinks'
2012-05-10  Junio C HamanoMerge branch 'maint'
2012-05-09  Ralf ThielowMerge branch 'maint' into master
2012-05-08  Junio C HamanoMerge branch 'rs/maint-dir-strbuf' into rs/dir-strbuf
2012-05-08  Jeff KingMerge branch 'jk/maint-status-porcelain-z-b' into HEAD
2012-05-08  Jiang XinMerge branch 'maint'
2012-05-07  Junio C HamanoMerge branch 'nh/empty-rebase'
2012-05-07  Junio C HamanoMerge branch 'jk/maint-tformat-with-z'
2012-05-07  Junio C HamanoMerge branch 'th/difftool-diffall'
2012-05-07  Junio C HamanoSync with maint
2012-05-07  Junio C HamanoMerge branch 'jk/maint-gitweb-test-use-sane-perl' into...
2012-05-07  Junio C HamanoMerge branch 'ef/maint-1.7.6-clone-progress-fix' into...
2012-05-03  Junio C HamanoMerge branch 'maint'
2012-05-03  Junio C HamanoMerge branch 'jk/maint-push-progress'
2012-05-03  Junio C HamanoMerge branch 'nd/columns'
2012-05-02  Junio C HamanoMerge branch 'tr/xdiff-fast-hash'
2012-05-02  Junio C HamanoMerge branch 'jk/maint-gitweb-test-use-sane-perl'
2012-05-02  Junio C HamanoMerge branch 'jc/rerere-train'
2012-05-02  Junio C HamanoMerge branch 'lp/diffstat-with-graph'
2012-05-02  Junio C HamanoMerge branch 'zj/mksh-columns-breakage'
2012-05-02  Junio C HamanoMerge branch 'jk/doc-asciidoc-inline-literal'
2012-05-02  Junio C HamanoMerge branch 'jc/index-v4'
2012-05-02  Junio C HamanoSync with v1.7.10.1
2012-05-01  Jiang XinMerge l10n updates from branch 'maint' into master
2012-04-30  Junio C HamanoMerge branch 'ld/git-p4-tags-and-labels'
2012-04-30  Junio C HamanoMerge branch 'nh/empty-rebase'
2012-04-30  Junio C HamanoMerge branch 'jk/maint-config-bogus-section'
2012-04-30  Junio C HamanoMerge branch 'js/daemon-test-race-fix'
2012-04-30  Junio C HamanoMerge branch 'kk/gitweb-omit-expensive'
2012-04-30  Junio C HamanoMerge branch 'kk/maint-gitweb-missing-owner'
2012-04-30  Junio C HamanoMerge branch 'mm/include-userpath'
2012-04-30  Junio C HamanoMerge branch 'pw/t5800-import-race-fix'
2012-04-30  Junio C HamanoMerge branch 'jk/repack-no-explode-objects-from-old...
2012-04-28  Jiang XinMerge branch 'maint'
2012-04-28  Jiang XinMerge master branch for tracking l10n updates of next...
2012-04-27  Junio C HamanoMerge branch 'jc/merge-reduce-parents-early'
2012-04-27  Junio C HamanoMerge branch 'js/fast-import-test-9300'
2012-04-27  Junio C HamanoMerge branch 'rt/cherry-revert-conflict-summary'
2012-04-27  Junio C HamanoMerge branch 'cb/maint-report-mount-point-correctly...
2012-04-27  Junio C HamanoMerge branch 'cb/cherry-pick-rev-path-confusion'
2012-04-27  Junio C HamanoMerge branch 'cb/http-multi-curl-auth'
2012-04-26  Junio C HamanoMerge branch 'rl/maint-stash-i18n-save-error'
2012-04-26  Junio C HamanoMerge branch 'mb/fetch-call-a-non-branch-a-ref'
2012-04-26  Junio C HamanoMerge branch 'jm/maint-strncpy-diff-no-index'
2012-04-26  Junio C HamanoMerge bundle error message fix in
2012-04-26  Junio C HamanoMerge branch 'rs/combine-diff-zero-context-at-the-begin...
2012-04-26  Junio C HamanoMerge branch 'jk/add-p-skip-conflicts' into maint
next