git-remote-mediawiki: more efficient 'pull' in the best case
[git.git] / merge-recursive.c
2012-05-02 Junio C HamanoMerge branch 'pw/fast-import-dataref-parsing' into...
2012-05-02 Junio C HamanoMerge branch 'it/fetch-pack-many-refs' into maint
2012-05-02 Junio C HamanoMerge branch 'jl/maint-submodule-recurse-fetch' into...
2012-05-02 Junio C HamanoMerge branch 'jc/maint-blame-minimal' into maint
2012-05-02 Junio C HamanoMerge branch 'lp/maint-diff-three-dash-with-graph'...
2012-05-02 Junio C HamanoMerge branch 'jk/rebase-i-submodule-conflict-only'...
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 maint branch for tracking l10n updates of git...
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 'jk/run-command-eacces' into maint
2012-04-26 Junio C HamanoMerge branch 'jc/push-upstream-sanity' into maint
2012-04-26 Junio C HamanoMerge branch 'jc/maint-clean-nested-worktree-in-subdir...
2012-04-26 Junio C HamanoMerge branch 'jk/diff-no-rename-empty' into maint
2012-04-26 Junio C HamanoMerge branch 'rs/combine-diff-zero-context-at-the-begin...
2012-04-26 Junio C HamanoMerge branch 'jc/commit-unedited-template' into maint
2012-04-26 Junio C HamanoMerge branch 'jk/add-p-skip-conflicts' into maint
2012-04-26 Junio C HamanoMerge branch 'jc/commit-hook-authorship' into maint
2012-04-26 Junio C HamanoMerge branch 'tr/maint-word-diff-regex-sticky' into...
2012-04-26 Junio C HamanoMerge branch 'jh/notes-merge-in-git-dir-worktree' into...
2012-04-26 Junio C HamanoSync with 1.7.9.7
2012-04-26 Junio C HamanoSync with 1.7.8.6
2012-04-26 Junio C HamanoSync with 1.7.7.7
2012-04-24 Junio C HamanoMerge branch 'fc/completion-tests'
2012-04-24 Junio C HamanoMerge branch 'cc/fix-missing-va-end-in-revert'
2012-04-24 Junio C HamanoMerge branch 'zj/upstream-error-message'
2012-04-24 Junio C HamanoMerge branch 'mk/gitweb-diff-hl'
2012-04-24 Junio C HamanoMerge branch 'it/fetch-pack-many-refs'
2012-04-24 Junio C HamanoMerge branch 'pw/fast-import-dataref-parsing'
2012-04-24 Junio C HamanoMerge branch 'mh/ref-api'
2012-04-24 Junio C HamanoMerge branch 'hv/submodule-recurse-push'
2012-04-23 Junio C HamanoMerge branch 'bw/test-fix-grep-gnuism'
2012-04-23 Junio C HamanoMerge branch 'rj/submodule-mswin-path'
2012-04-23 Junio C HamanoMerge branch 'rj/sh-setup-mswin-pwd'
2012-04-23 Junio C HamanoMerge branch 'rj/mingw-isguid'
2012-04-23 Junio C HamanoMerge branch 'jn/fast-import-doc'
2012-04-23 Junio C HamanoMerge branch 'jn/more-i18ncmp'
2012-04-23 Junio C HamanoMerge branch 'jl/maint-submodule-recurse-fetch'
2012-04-23 Junio C HamanoMerge branch 'jc/maint-blame-minimal'
2012-04-23 Junio C HamanoMerge branch 'lp/maint-diff-three-dash-with-graph'
2012-04-23 Junio C HamanoMerge branch 'rs/commit-list-sort-in-batch'
2012-04-23 Junio C HamanoMerge branch 'jh/apply-free-patch'
2012-04-23 Junio C HamanoMerge branch 'sl/test-wc-l-line-count'
2012-04-23 Junio C HamanoMerge branch 'jn/debian-customizes-default-editor'
2012-04-23 Junio C HamanoMerge branch 'rl/show-empty-prefix'
2012-04-23 Junio C HamanoMerge branch 'pw/git-p4'
2012-04-23 Junio C HamanoMerge branch 'ms/remote-usage-string'
2012-04-23 Junio C HamanoMerge branch 'jk/rebase-i-submodule-conflict-only'
2012-04-20 Junio C HamanoMerge branch 'js/spawn-via-shell-path-fix'
2012-04-20 Junio C HamanoMerge branch 'ct/advise-push-default'
2012-04-20 Junio C HamanoMerge branch 'bw/submodule-sed-solaris'
2012-04-20 Junio C HamanoMerge branch 'jk/run-command-eacces'
2012-04-20 Junio C HamanoMerge branch 'jc/push-upstream-sanity'
2012-04-20 Junio C HamanoMerge branch 'jc/am-report-3way'
2012-04-20 Junio C HamanoMerge branch 'jb/am-include'
2012-04-20 Junio C HamanoMerge branch 'jc/fmt-merge-msg-people'
2012-04-16 Junio C HamanoMerge branch 'jk/add-p-skip-conflicts'
2012-04-16 Junio C HamanoMerge branch 'jc/commit-unedited-template'
2012-04-16 Junio C HamanoMerge branch 'bw/spawn-via-shell-path'
2012-04-16 Junio C HamanoMerge branch 'wk/gitweb-snapshot-use-if-modified-since'
2012-04-16 Junio C HamanoMerge branch 'jk/http-backend-keep-committer-ident...
2012-04-16 Junio C HamanoMerge branch 'sl/autoconf'
2012-04-16 Junio C HamanoMerge branch 'jk/branch-quiet'
2012-04-16 Junio C HamanoMerge branch 'rs/combine-diff-zero-context-at-the-begin...
2012-04-16 Junio C HamanoMerge branch 'jk/diff-no-rename-empty'
2012-04-16 Junio C HamanoMerge branch 'jc/maint-clean-nested-worktree-in-subdir'
2012-04-16 Junio C HamanoMerge branch 'rs/unpack-trees-leakfix'
2012-04-16 Junio C HamanoMerge branch 'nl/rebase-i-cheat-sheet'
2012-04-16 Junio C HamanoMerge branch 'da/difftool-test'
2012-04-16 Junio C HamanoMerge branch 'zj/test-cred-helper-nicer-prove'
2012-04-16 Junio C HamanoMerge branch 'jh/notes-merge-in-git-dir-worktree'
2012-04-16 Junio C HamanoMerge branch 'tr/maint-word-diff-regex-sticky'
2012-04-16 Junio C HamanoMerge branch 'jn/diffstat-tests'
2012-04-16 Junio C HamanoMerge branch 'jc/diff-algo-cleanup'
2012-04-16 Junio C HamanoMerge branch 'jc/commit-hook-authorship'
2012-04-10 Junio C HamanoMerge branch 'maint-1.7.9' into maint
2012-04-10 Junio C HamanoMerge branch 'maint-1.7.8' into maint-1.7.9
2012-04-10 David A. GreeneAdd 'contrib/subtree/' from commit 'd3a04e06c77d57978bb...
2012-04-09 Junio C HamanoMerge branch 'jc/maint-verify-objects-remove-pessimism...
2012-04-09 Junio C HamanoMerge branch 'dw/gitweb-doc-grammo' into maint-1.7.8
2012-04-09 Junio C HamanoMerge branch 'tr/cache-tree' into maint-1.7.8
next