apply: --3way with add/add conflict
[gitweb.git] / setup.c
2012-05-07 Merge branch 'nh/empty-rebase'
2012-05-07 Merge branch 'jk/maint-tformat-with-z'
2012-05-07 Merge branch 'th/difftool-diffall'
2012-05-07 Merge branch 'jk/maint-gitweb-test-use-sane-perl' into...
2012-05-07 Merge branch 'js/daemon-test-race-fix' into maint
2012-05-07 Merge branch 'jk/maint-config-bogus-section' into maint
2012-05-07 Merge branch 'pw/t5800-import-race-fix' into maint
2012-05-07 Merge branch 'rt/cherry-revert-conflict-summary' into...
2012-05-07 Merge branch 'cb/maint-report-mount-point-correctly...
2012-05-03 Merge branch 'maint'
2012-05-03 Merge branch 'jk/maint-push-progress'
2012-05-03 Merge branch 'nd/columns'
2012-05-02 Merge branch 'tr/xdiff-fast-hash'
2012-05-02 Merge branch 'jk/maint-gitweb-test-use-sane-perl'
2012-05-02 Merge branch 'jc/rerere-train'
2012-05-02 Merge branch 'lp/diffstat-with-graph'
2012-05-02 Merge branch 'zj/mksh-columns-breakage'
2012-05-02 Merge branch 'jk/doc-asciidoc-inline-literal'
2012-05-02 Merge branch 'nd/i18n'
2012-05-02 Merge branch 'mm/simple-push'
2012-05-02 Merge branch 'jc/index-v4'
2012-05-02 Sync with v1.7.10.1
2012-05-02 Merge branch 'it/fetch-pack-many-refs' into maint
2012-05-02 Merge branch 'jc/maint-blame-minimal' into maint
2012-05-02 Merge branch 'lp/maint-diff-three-dash-with-graph'...
2012-05-02 Merge branch 'jk/rebase-i-submodule-conflict-only'...
2012-05-01 Merge l10n updates from branch 'maint' into master
2012-04-30 Merge branch 'ld/git-p4-tags-and-labels'
2012-04-30 Merge branch 'nh/empty-rebase'
2012-04-30 Merge branch 'jk/maint-config-bogus-section'
2012-04-30 Merge branch 'js/daemon-test-race-fix'
2012-04-30 Merge branch 'kk/gitweb-omit-expensive'
2012-04-30 Merge branch 'kk/maint-gitweb-missing-owner'
2012-04-30 Merge branch 'rs/commit-list-append'
2012-04-30 Merge branch 'mm/include-userpath'
2012-04-30 Merge branch 'pw/t5800-import-race-fix'
2012-04-30 Merge branch 'jk/repack-no-explode-objects-from-old...
2012-04-30 Merge git://git.bogomips.org/git-svn
2012-04-28 Merge branch 'maint'
2012-04-28 Merge master branch for tracking l10n updates of next...
2012-04-27 Merge branch 'jc/merge-reduce-parents-early'
2012-04-27 Merge branch 'js/fast-import-test-9300'
2012-04-27 Merge branch 'rt/cherry-revert-conflict-summary'
2012-04-27 Merge branch 'cb/maint-report-mount-point-correctly...
2012-04-26 Merge branch 'jk/run-command-eacces' into maint
2012-04-26 Merge branch 'rs/combine-diff-zero-context-at-the-begin...
2012-04-26 Merge branch 'jc/commit-unedited-template' into maint
2012-04-26 Merge branch 'jk/add-p-skip-conflicts' into maint
2012-04-26 Sync with 1.7.8.6
2012-04-26 Sync with 1.7.7.7
2012-04-24 Merge branch 'cc/fix-missing-va-end-in-revert'
2012-04-24 Merge branch 'it/fetch-pack-many-refs'
2012-04-24 Merge branch 'hv/submodule-recurse-push'
2012-04-23 Merge branch 'bw/test-fix-grep-gnuism'
2012-04-23 Merge branch 'jc/maint-blame-minimal'
2012-04-23 Merge branch 'lp/maint-diff-three-dash-with-graph'
2012-04-23 Merge branch 'rs/commit-list-sort-in-batch'
2012-04-23 Merge branch 'jh/apply-free-patch'
2012-04-23 Merge branch 'jn/debian-customizes-default-editor'
2012-04-23 Merge branch 'jk/rebase-i-submodule-conflict-only'
2012-04-20 Merge branch 'jk/run-command-eacces'
2012-04-20 Merge branch 'jb/am-include'
2012-04-16 Merge branch 'jk/add-p-skip-conflicts'
2012-04-16 Merge branch 'jc/commit-unedited-template'
2012-04-16 Merge branch 'rs/combine-diff-zero-context-at-the-begin...
2012-04-16 Merge branch 'jc/diff-algo-cleanup'
2012-04-15 properly keep track of current working directory
2012-04-10 Merge branch 'maint-1.7.8' into maint-1.7.9
2012-04-10 Add 'contrib/subtree/' from commit 'd3a04e06c77d57978bb...
2012-04-09 Merge branch 'cb/maint-t5541-make-server-port-portable...
2012-04-02 Merge branch 'pt/gitk'
2012-03-26 Merge branch 'jn/maint-fast-import-empty-ls' into maint
2012-03-26 Merge branch 'ph/rerere-doc' into maint
2012-03-26 Merge branch 'ms/maint-config-error-at-eol-linecount...
2012-03-24 Merge gitk changes from Paul Mackerras at git://ozlabs...
2012-03-23 Merge branch 'am/completion-zsh-fix'
2012-03-23 Merge branch 'dw/gitweb-doc-grammo'
2012-03-20 Merge branch 'maint-1.7.8' into maint
2012-03-16 Merge branch 'jc/maint-verify-objects-remove-pessimism'
2012-03-16 Merge "two fixes for fast-import's 'ls' command" from...
2012-03-16 Merge branch 'th/doc-diff-submodule-option'
2012-03-13 Merge branch 'ms/maint-config-error-at-eol-linecount'
2012-03-13 Merge branch 'ph/rerere-doc'
2012-03-12 Merge branch 'az/verify-tag-use-gpg-config'
2012-03-12 Merge branch 'tr/maint-bundle-boundary' into maint
2012-03-12 Merge branch 'jc/maint-diff-patch-header' into maint
2012-03-12 Merge branch 'jn/maint-do-not-match-with-unsanitized...
2012-03-12 Merge branch 'jc/am-3-nonstandard-popt' into maint
2012-03-08 Merge branch 'jl/maint-submodule-relative'
2012-03-08 Merge branch 'jn/maint-do-not-match-with-unsanitized...
2012-03-07 Merge branch 'jc/pickaxe-ignore-case'
2012-03-06 Merge branch 'jc/maint-diff-patch-header'
2012-03-06 Merge branch 'tr/maint-bundle-boundary'
2012-03-06 Merge branch 'zj/diff-stat-dyncol'
2012-03-06 Merge branch 'maint-1.7.8' into maint
2012-03-06 Merge branch 'maint-1.7.7' into maint-1.7.8
2012-03-05 Merge branch 'jc/doc-merge-options' into maint
2012-03-05 Merge branch 'cn/maint-rev-list-doc' into maint
2012-03-05 Merge branch 'jc/am-3-nonstandard-popt'
2012-03-05 Merge branch 'cn/maint-branch-with-bad' into maint
next