advice: Introduce error_resolve_conflict
[gitweb.git] / LGPL-2.1
2011-06-20 Merge branch 'mk/grep-pcre'
2011-06-17 Merge branch 'ab/i18n-scripts-basic'
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 Merge branch 'jk/maint-config-alias-fix' into maint
2011-06-01 Merge branch 'kk/maint-prefix-in-config-mak' into maint
2011-05-31 Merge branch 'jk/format-patch-am'
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/maint-remote-mirror-safer'
2011-05-31 Merge branch 'tr/add-i-no-escape' into maint
2011-05-31 Merge branch 'vh/config-interactive-singlekey-doc'...
2011-05-31 Merge branch 'ml/test-readme' into maint
2011-05-31 Merge branch 'ab/i18n-fixup' into maint
2011-05-31 Merge branch 'jc/rename-degrade-cc-to-c' into maint
2011-05-31 Merge branch 'rr/doc-content-type' into maint
2011-05-31 Merge branch 'jk/maint-config-alias-fix'
2011-05-30 Merge branch 'jm/maint-misc-fix' into 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-30 Merge branch 'jn/run-command-error-failure' into maint
2011-05-26 Merge branch 'rg/no-gecos-in-pwent'
2011-05-26 Merge branch 'jk/fetch-mark-complete-optimization'
2011-05-26 Merge branch 'jn/gitweb-js'
2011-05-26 Merge branch 'jn/ctags-more'
2011-05-26 Merge branch 'jc/require-work-tree-exists'
2011-05-26 Merge branch 'maint-1.7.4' into maint
2011-05-26 Merge branch 'jm/maint-diff-words-with-sbe' into maint
2011-05-26 Merge branch 'kk/maint-prefix-in-config-mak' into maint
2011-05-26 Merge branch 'mg/diff-uiconfig-doc' into maint
2011-05-26 Merge branch 'ft/gitweb-tar-with-gzip-n' into maint
2011-05-26 Merge branch 'ss/doc-svn' into maint
2011-05-26 Merge branch 'jn/format-patch-doc' into maint
2011-05-26 Merge branch 'jc/maint-pathspec-stdin-and-cmdline'...
2011-05-26 Merge branch 'jk/cherry-pick-root-with-resolve' into...
2011-05-26 Merge branch 'rg/copy-gecos-username' into maint
2011-05-26 Merge branch 'fc/completion-zsh' 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-26 Merge branch 'svn-fe-maint' of git://repo.or.cz/git...
2011-05-25 Merge branch 'jc/bigfile'
2011-05-25 Merge branch 'js/log-abbrev-commit-config'
2011-05-23 Merge branch 'tr/add-i-no-escape'
2011-05-23 Merge branch 'jm/maint-diff-words-with-sbe'
2011-05-23 Merge branch 'js/mingw-shutdown'
2011-05-23 Merge branch 'ms/ls-remote-exit-with-status'
2011-05-23 Merge branch 'mg/config-symbolic-constants'
2011-05-23 Merge branch 'ab/i18n-scripts-basic'
2011-05-23 Merge branch 'jc/magic-pathspec'
2011-05-23 Merge branch 'jk/blame-line-porcelain'
2011-05-20 Merge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline'
2011-05-20 Merge branch 'rg/copy-gecos-username'
2011-05-20 Merge branch 'jl/submodule-conflicted-gitmodules'
2011-05-20 Merge branch 'jc/replacing'
2011-05-20 Merge branch 'nd/sparse-co-fix'
2011-05-20 Merge branch 'ld/p4-preserve-user-names'
2011-05-20 Merge branch 'ms/tagname-does-not-begin-with-dash'
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 Merge branch 'jk/cherry-pick-root-with-resolve'
2011-05-20 Merge branch 'jc/maint-pathspec-stdin-and-cmdline'
2011-05-20 Merge 1.7.5.2 in
2011-05-20 provide a copy of the LGPLv2.1