apply: --3way with add/add conflict
[gitweb.git] / tree-walk.h
2012-05-07 Merge branch 'jk/maint-tformat-with-z'
2012-05-07 Merge branch 'jk/maint-gitweb-test-use-sane-perl' into...
2012-05-02 Merge branch 'jk/maint-gitweb-test-use-sane-perl'
2012-05-02 Merge branch 'lp/maint-diff-three-dash-with-graph'...
2012-04-26 Merge branch 'rs/combine-diff-zero-context-at-the-begin...
2012-04-26 Merge branch 'jk/add-p-skip-conflicts' into maint
2012-04-26 Sync with 1.7.7.7
2012-04-24 Merge branch 'cc/fix-missing-va-end-in-revert'
2012-04-23 Merge branch 'lp/maint-diff-three-dash-with-graph'
2012-04-20 Merge branch 'jb/am-include'
2012-04-16 Merge branch 'jk/add-p-skip-conflicts'
2012-04-16 Merge branch 'rs/combine-diff-zero-context-at-the-begin...
2012-04-16 Merge branch 'jc/diff-algo-cleanup'
2012-04-10 Add 'contrib/subtree/' from commit 'd3a04e06c77d57978bb...
2012-04-09 Merge branch 'tr/cache-tree' into maint-1.7.8
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 'ms/maint-config-error-at-eol-linecount...
2012-03-24 Merge gitk changes from Paul Mackerras at git://ozlabs...
2012-03-20 Merge branch 'ks/sort-wildcard-in-makefile' into maint...
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-12 Merge branch 'jc/maint-diff-patch-header' into maint
2012-03-12 Merge branch 'jn/maint-do-not-match-with-unsanitized...
2012-03-08 Merge branch 'jl/maint-submodule-relative'
2012-03-08 Merge branch 'jn/maint-do-not-match-with-unsanitized...
2012-03-06 Merge branch 'jc/maint-diff-patch-header'
2012-03-06 Merge branch 'maint-1.7.7' into maint-1.7.8
2012-03-05 Merge branch 'jn/maint-gitweb-invalid-regexp' into...
2012-03-05 Merge branch 'sp/smart-http-failure-to-push' into maint
2012-03-02 Merge branch 'rs/no-no-no-parseopt'
2012-03-01 Merge branch 'jn/maint-gitweb-invalid-regexp'
2012-02-27 Merge branch 'pj/remote-set-branches-usage-fix' into...
2012-02-27 Merge branch 'jn/ancient-meld-support' into maint
2012-02-27 Merge branch 'sp/smart-http-failure-to-push'
2012-02-23 Merge branch 'pj/remote-set-branches-usage-fix'
2012-02-21 Merge branch 'jk/git-dir-lookup' into maint
2012-02-21 Merge branch 'cb/maint-t5541-make-server-port-portable...
2012-02-20 Merge branch 'cb/maint-t5541-make-server-port-portable'
2012-02-16 Merge branch 'jc/checkout-out-of-unborn' into maint
2012-02-16 Merge branch 'jc/maint-mailmap-output' into maint
2012-02-16 Merge branch 'jc/maint-commit-ignore-i-t-a' into maint
2012-02-16 Merge branch 'mm/empty-loose-error-message' into maint
2012-02-14 Merge branch 'jk/git-dir-lookup'
2012-02-14 Merge branch 'jn/ancient-meld-support'
2012-02-14 Merge branch 'jk/maint-tag-show-fixes' into maint
2012-02-14 Merge branch 'bw/inet-pton-ntop-compat' into maint
2012-02-13 Merge branch 'js/add-e-submodule-fix' into maint
2012-02-13 Merge branch 'jc/parse-date-raw' into maint
2012-02-13 Merge branch 'jc/checkout-out-of-unborn'
2012-02-13 Merge branch 'jc/maint-mailmap-output'
2012-02-13 Merge branch 'bw/inet-pton-ntop-compat'
2012-02-13 Merge branch 'jc/maint-commit-ignore-i-t-a'
2012-02-13 Merge branch 'jk/maint-tag-show-fixes'
2012-02-13 Merge branch 'mm/empty-loose-error-message'
2012-02-10 Merge branch 'js/add-e-submodule-fix'
2012-02-10 Merge branch 'jc/parse-date-raw'
2012-02-10 Merge branch 'jl/submodule-re-add' into maint
2012-02-10 Merge branch 'da/maint-mergetool-twoway' into maint
2012-02-06 Merge branch 'sp/smart-http-failure-to-push' into maint
2012-02-06 Merge branch 'jc/maint-log-first-parent-pathspec' into...
2012-02-06 Sync with 1.7.6.6
2012-02-06 Sync with 1.7.6.6
2012-02-01 Merge branch 'jc/pull-signed-tag'
2012-02-01 Merge branch 'da/maint-mergetool-twoway'
2012-02-01 Merge branch 'jl/submodule-re-add'
2012-02-01 Merge branch 'ks/sort-wildcard-in-makefile'
2012-01-29 Merge branch 'rs/diff-postimage-in-context'
2012-01-29 Merge branch 'sp/smart-http-failure-to-push'
2012-01-29 Merge branch 'jc/maint-log-first-parent-pathspec'
2012-01-29 Merge branch 'tr/maint-mailinfo'
2012-01-29 Merge branch 'nd/maint-refname-in-hierarchy-check'
2012-01-27 Merge branch 'svn-fe' of git://repo.or.cz/git/jrn into...
2012-01-18 Merge branch 'maint-1.7.7' into maint
2012-01-18 Merge branch 'jk/credentials'
2012-01-18 Merge branch 'mh/maint-show-ref-doc'
2012-01-18 Merge branch 'tr/maint-word-diff-incomplete-line'
2012-01-13 Merge branch 'jc/request-pull-show-head-4'
2012-01-13 Merge branch 'tr/maint-mailinfo'
2012-01-13 Merge branch 'jk/maint-upload-archive'
2012-01-13 Merge branch 'maint-1.7.7' into maint
2012-01-13 Merge branch 'maint-1.7.6' into maint-1.7.7
2012-01-12 Merge branch 'maint-1.7.7' into maint
2012-01-12 Merge branch 'maint-1.7.6' into maint-1.7.7
2012-01-10 Merge the attributes fix in from maint-1.6.7 branch
2012-01-10 Merge the attributes fix in from maint-1.6.6 branch
2012-01-09 Merge branch 'jk/credentials'
2012-01-09 Merge branch 'mm/maint-gitweb-project-maxdepth'
2012-01-06 Merge branch 'jc/show-sig'
2012-01-06 Merge branch 'jn/maint-gitweb-utf8-fix' into maint
2012-01-06 Merge branch 'maint-1.7.7' into maint
2012-01-06 Merge branch 'maint-1.7.6' into maint-1.7.7
2012-01-04 Merge branch 'nd/maint-parse-depth' into maint
2012-01-03 Merge branch 'maint-1.7.7' into maint
2012-01-03 Merge branch 'maint-1.7.6' into maint-1.7.7
2011-12-28 Merge branch 'jv/maint-config-set' into maint
2011-12-28 Merge branch 'jc/checkout-m-twoway' into maint
2011-12-28 Merge branch 'tr/doc-sh-setup' into maint
next