advice: Introduce error_resolve_conflict
[gitweb.git] / block-sha1 /
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-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-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-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-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.1' into maint-1.7.2
2011-02-16 Merge branch 'maint-1.7.0' into maint-1.7.1
2011-02-10 Merge branch 'tr/merge-unborn-clobber'
2011-02-10 Merge branch 'maint-1.7.0' into maint
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.1' into maint-1.7.2
2011-01-10 Merge branch 'maint-1.7.0' into maint-1.7.1
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-fast-import-object-reuse'
2010-12-15 Git 1.7.2.5 v1.7.2.5
2010-12-15 Git 1.7.1.4 v1.7.1.4
2010-12-15 Git 1.6.5.9 v1.6.5.9
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-02 Git 1.7.2.4 v1.7.2.4
2010-12-02 Git 1.7.1.3 v1.7.1.3
2010-12-02 Merge branch 'maint-1.7.1' into maint-1.7.2
2010-12-02 Merge branch 'maint-1.7.0' into maint-1.7.1
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 'aw/git-p4-deletion' into maint
2010-11-05 Merge branch 'aw/git-p4-deletion'
2010-11-05 Merge branch 'master' of git://repo.or.cz/git-gui
2010-10-27 Merge branch 'kb/merge-recursive-rename-threshold'
2010-10-27 Merge branch 'jf/merge-ignore-ws'
2010-10-27 Merge branch 'en/tree-walk-optim'
2010-09-29 Merge branch 'rr/format-patch-count-without-merges'
2010-09-18 Merge branch 'js/ls-files-x-doc'
2010-09-15 Merge git://repo.or.cz/git-gui
2010-09-08 Merge branch 'bc/maint-fetch-url-only'
2010-09-08 Merge branch 'en/d-f-conflict-fix'
2010-09-06 Merge branch 'xx/trivial' into maint
2010-09-04 Merge branch 'nd/maint-fix-replace'
2010-09-03 Merge branch 'jn/merge-renormalize'
2010-09-01 Merge branch 'sg/rerere-gc-old-still-used' into maint
2010-09-01 Merge branch 'en/rebase-against-rebase-fix' into maint
2010-08-31 Merge branch 'en/d-f-conflict-fix'
2010-08-31 Merge branch 'en/fast-export-fix'
2010-08-31 Merge branch 'sg/rerere-gc-old-still-used'
2010-08-30 Merge branch 'maint-1.7.1' into maint
2010-08-22 Merge branch 'nd/fix-sparse-checkout'
2010-08-22 Merge branch 'en/rebase-against-rebase-fix'
2010-08-19 Merge branch 'tr/xsize-bits' into maint
2010-08-19 Merge branch 'jc/sha1-name-find-fix' into maint
2010-08-18 Merge branch 'sp/fix-smart-http-deadlock-on-error'...
2010-08-18 Merge branch 'cc/find-commit-subject'
2010-08-18 Merge branch 'tr/xsize-bits'
2010-08-18 Merge branch 'tc/checkout-B'
2010-08-13 Merge branch 'jc/sha1-name-find-fix'
2010-08-13 Merge branch 'sp/fix-smart-http-deadlock-on-error'
2010-08-03 Merge branch 'sv/maint-diff-q-clear-fix' into maint
2010-08-02 Merge branch 'ab/tap' into maint
next