advice: Introduce error_resolve_conflict
[gitweb.git] / bisect.c
2011-06-20 Merge branch 'mk/grep-pcre'
2011-06-19 Merge branch 'maint'
2011-06-17 Merge branch 'ab/i18n-scripts-basic'
2011-06-09 Merge branch 'maint'
2011-06-07 Merge branch 'jc/magic-pathspec'
2011-06-06 Merge branch 'jn/mime-type-with-params'
2011-06-06 Merge branch 'jk/diff-not-so-quick'
2011-06-06 Merge branch 'bc/maint-status-z-to-use-porcelain'
2011-06-01 Sync with 1.7.5.4 v1.7.6-rc0
2011-05-31 Merge branch 'jk/format-patch-am'
2011-05-31 Merge branch 'jn/doc-remote-helpers'
2011-05-31 Merge branch 'ab/i18n-envsubst-doc-fix'
2011-05-31 Merge branch 'jc/log-quiet-fix'
2011-05-31 Merge branch 'kk/maint-prefix-in-config-mak'
2011-05-31 Merge branch 'jk/rebase-head-reflog'
2011-05-31 Merge branch 'jk/maint-docs'
2011-05-31 Merge branch 'jk/read-in-full-stops-on-error'
2011-05-31 Merge branch 'jk/maint-remote-mirror-safer'
2011-05-31 Merge branch 'jl/read-tree-m-dry-run'
2011-05-31 Sync with maint
2011-05-31 Merge branch 'jc/fmt-req-fix'
2011-05-31 Merge branch 'jk/maint-config-alias-fix'
2011-05-30 Merge branch 'maint'
2011-05-30 Merge branch 'mk/grep-pcre'
2011-05-30 Merge branch 'jc/notes-batch-removal'
2011-05-30 Merge branch 'jk/haves-from-alternate-odb'
2011-05-26 Merge branch 'rg/no-gecos-in-pwent'
2011-05-26 Merge branch 'jk/git-connection-deadlock-fix' into...
2011-05-26 Merge branch 'js/maint-send-pack-stateless-rpc-deadlock...
2011-05-26 Merge branch 'rg/copy-gecos-username' into maint
2011-05-26 Merge branch 'jk/git-connection-deadlock-fix' into...
2011-05-26 Merge branch 'js/maint-send-pack-stateless-rpc-deadlock...
2011-05-20 Merge branch 'rg/copy-gecos-username'
2011-05-20 Merge branch 'jk/git-connection-deadlock-fix'
2011-05-20 Merge branch 'js/maint-send-pack-stateless-rpc-deadlock...
2011-05-20 bisect: refactor sha1_array into a generic sha1 list
2011-05-17 Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc...
2011-05-16 Merge branch 'jc/maint-branch-mergeoptions' into maint
2011-05-13 Merge branch 'js/maint-send-pack-stateless-rpc-deadlock...
2011-05-13 Merge branch 'jk/merge-one-file-working-tree' into...
2011-05-11 Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'
2011-05-11 Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'
2011-05-11 Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'
2011-05-11 Merge branch 'jc/maint-branch-mergeoptions'
2011-05-06 Merge branch 'jc/maint-branch-mergeoptions' into mg...
2011-05-06 Merge branch 'im/hashcmp-optim'
2011-05-06 Merge branch 'jk/merge-one-file-working-tree'
2011-05-05 Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc...
2011-05-04 Merge branch 'sp/maint-clear-postfields' into maint
2011-04-28 Merge branch 'sp/maint-clear-postfields'
2011-04-27 Merge branch 'ef/maint-strbuf-init'
2011-04-25 Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc...
2011-04-11 Merge git://git.kernel.org/pub/scm/gitk/gitk
2011-04-03 Merge branch 'jc/maint-rev-list-culled-boundary' into...
2011-04-01 Merge branch 'jc/maint-diff-q-filter' into maint
2011-03-27 Merge branch 'jc/maint-rerere-in-workdir'
2011-03-26 Merge git-gui 0.14.0
2011-03-23 Merge branch 'jc/maint-diff-q-filter'
2011-03-23 Merge branch 'jc/maint-rev-list-culled-boundary'
2011-03-16 Merge branch 'jk/diffstat-binary' into maint
2011-03-14 Merge branch 'sp/maint-smart-http-sans-100-continue'
2011-03-04 Merge branch 'jk/diffstat-binary'
2011-02-28 Merge branch 'sp/maint-smart-http-sans-100-continue'
2011-02-16 Merge branch 'maint-1.7.2' into maint-1.7.3
2011-02-10 Merge branch 'tr/merge-unborn-clobber'
2011-02-10 Merge branch 'maint-1.7.0' into maint
2011-01-27 Merge branch 'jn/fast-import-empty-tree-removal' into...
2011-01-19 Merge branch 'jk/diff-driver-binary-doc' into maint
2011-01-19 Merge branch 'tr/submodule-relative-scp-url' into maint
2011-01-19 Merge branch 'jn/maint-fast-import-object-reuse' into...
2011-01-19 Merge branch 'nd/maint-relative' into maint
2011-01-13 Merge branch 'jk/diff-driver-binary-doc'
2011-01-13 Merge branch 'tr/submodule-relative-scp-url'
2011-01-10 Merge branch 'maint-1.7.2' into maint
2010-12-26 Merge branch 'rs/maint-diff-fd-leak' into maint
2010-12-16 Merge branch 'nd/maint-relative'
2010-12-16 Merge branch 'jn/maint-svn-fe'
2010-12-16 Merge branch 'jn/maint-fast-import-object-reuse'
2010-12-15 Git 1.7.3.4 v1.7.3.4
2010-12-15 Git 1.7.0.9 v1.7.0.9
2010-12-15 Git 1.6.6.3 v1.6.6.3
2010-12-15 Merge branch 'master' (early part) into pd/bash-4-compl...
2010-12-14 Merge git://git.kernel.org/pub/scm/gitk/gitk
2010-12-14 Merge branch 'jk/maint-reflog-bottom' into maint
2010-12-14 Merge branch 'mz/maint-rebase-stat-config' into maint
2010-12-13 Merge branch 'jk/maint-reflog-bottom'
2010-12-13 Merge branch 'mz/maint-rebase-stat-config'
2010-12-09 Merge branch 'np/diff-in-corrupt-repository' into maint
2010-12-09 Merge branch 'cm/diff-check-at-eol' into maint
2010-12-08 Merge branch 'jh/notes-merge'
2010-12-04 Merge branch 'jj/icase-directory'
2010-12-02 Prepare for 1.7.3.3
2010-12-02 Merge branch 'cb/maint-orphan-merge-noclobber' into...
2010-12-02 Merge branch 'ks/no-textconv-symlink' into maint
2010-12-02 Merge branch 'maint-1.7.2' into maint
2010-12-01 Merge branch 'js/maint-apply-tab-in-indent-fix' into...
2010-11-30 Merge branch 'np/diff-in-corrupt-repository'
2010-11-30 Merge branch 'cm/diff-check-at-eol'
2010-11-24 Merge branch 'cb/maint-orphan-merge-noclobber'
2010-11-24 Merge branch 'cb/diff-fname-optim' into maint
next