apply: --3way with add/add conflict
[gitweb.git] / t / t1300-repo-config.sh
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-03 Merge branch 'maint'
2012-05-03 Merge branch 'jc/merge-reduce-parents-early' into maint
2012-05-03 Merge branch 'mb/fetch-call-a-non-branch-a-ref' into...
2012-05-03 Merge branch 'rl/maint-stash-i18n-save-error' into...
2012-05-03 Merge branch 'jm/maint-strncpy-diff-no-index' into...
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 'zj/diff-stat-smaller-num-columns'
2012-05-02 Merge branch 'jc/rerere-train'
2012-05-02 Merge branch 'ab/i18n'
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 Merge branch 'master' of https://github.com/git-l10n...
2012-05-02 Sync with v1.7.10.1
2012-05-02 Merge branch 'pw/fast-import-dataref-parsing' into...
2012-05-02 Merge branch 'it/fetch-pack-many-refs' into maint
2012-05-02 Merge branch 'jl/maint-submodule-recurse-fetch' into...
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-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-27 Merge branch 'jc/merge-reduce-parents-early'
2012-04-27 Merge branch 'zj/mksh-columns-breakage' into lp/diffsta...
2012-04-26 Merge branch 'rl/maint-stash-i18n-save-error'
2012-04-26 Merge branch 'mb/fetch-call-a-non-branch-a-ref'
2012-04-26 Merge branch 'jm/maint-strncpy-diff-no-index'
2012-04-26 Merge branch 'jk/run-command-eacces' into maint
2012-04-26 Merge branch 'jc/push-upstream-sanity' into maint
2012-04-26 Merge branch 'jc/maint-clean-nested-worktree-in-subdir...
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 Merge branch 'jc/commit-hook-authorship' into maint
2012-04-26 Merge branch 'tr/maint-word-diff-regex-sticky' into...
2012-04-26 Merge branch 'jh/notes-merge-in-git-dir-worktree' into...
2012-04-26 Sync with 1.7.9.7
2012-04-26 Sync with 1.7.8.6
2012-04-26 Sync with 1.7.7.7
2012-04-26 config: reject bogus section names for --rename-section
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 'pw/fast-import-dataref-parsing'
2012-04-24 Merge branch 'hv/submodule-recurse-push'
2012-04-23 Merge branch 'bw/test-fix-grep-gnuism'
2012-04-23 Merge branch 'jl/maint-submodule-recurse-fetch'
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 'ms/remote-usage-string'
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 'jc/push-upstream-sanity'
2012-04-20 Merge branch 'jc/am-report-3way'
2012-04-20 Merge branch 'jb/am-include'
2012-04-20 Merge branch 'jc/fmt-merge-msg-people'
2012-04-16 Merge branch 'jk/add-p-skip-conflicts'
2012-04-16 Merge branch 'jc/commit-unedited-template'
2012-04-16 Merge branch 'jk/http-backend-keep-committer-ident...
2012-04-16 Merge branch 'jk/branch-quiet'
2012-04-16 Merge branch 'rs/combine-diff-zero-context-at-the-begin...
2012-04-16 Merge branch 'jc/maint-clean-nested-worktree-in-subdir'
2012-04-16 Merge branch 'rs/unpack-trees-leakfix'
2012-04-16 Merge branch 'zj/test-cred-helper-nicer-prove'
2012-04-16 Merge branch 'jh/notes-merge-in-git-dir-worktree'
2012-04-16 Merge branch 'tr/maint-word-diff-regex-sticky'
2012-04-16 Merge branch 'jn/diffstat-tests'
2012-04-16 Merge branch 'jc/diff-algo-cleanup'
2012-04-16 Merge branch 'jc/commit-hook-authorship'
2012-04-16 Merge branch 'nd/stream-more'
2012-04-10 Merge branch 'maint-1.7.9' into maint
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-04-02 Sync with 1.7.9.6
2012-04-02 Merge branch 'jc/maint-merge-autoedit' into maint
2012-03-31 Merge branch 'maint'
2012-03-26 Sync with 1.7.9.5
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'
next