advice: Introduce error_resolve_conflict
[gitweb.git] / t /
2011-06-20 Merge branch 'mk/grep-pcre'
2011-06-20 t7810: avoid unportable use of "echo"
2011-06-19 Merge branch 'di/no-no-existant'
2011-06-19 Merge branch 'maint'
2011-06-17 tests: link shell libraries into valgrind directory
2011-06-17 t/Makefile: pass test opts to valgrind target properly
2011-06-17 Merge branch 'ab/i18n-scripts-basic'
2011-06-16 Fix typo: existant->existent
2011-06-09 gitweb: do not misparse nonnumeric content tag files...
2011-06-09 Merge branch 'maint'
2011-06-07 Merge branch 'jc/magic-pathspec'
2011-06-07 t3703: skip more tests using colons in file names on...
2011-06-06 Merge branch 'jn/mime-type-with-params'
2011-06-06 Merge branch 'jn/gitweb-docs'
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-06-01 Merge branch 'jk/maint-config-alias-fix' into maint
2011-06-01 Merge branch 'jc/fmt-req-fix' into maint
2011-06-01 Merge branch 'jk/maint-docs' into maint
2011-06-01 Merge branch 'jn/doc-remote-helpers' 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 'jn/doc-remote-helpers'
2011-05-31 Merge branch 'jk/format-patch-empty-prefix'
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 '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 diff_tree: disable QUICK optimization with diff filter
2011-05-31 Merge branch 'jc/fmt-req-fix'
2011-05-31 Merge branch 'jk/maint-config-alias-fix'
2011-05-30 format-patch: make zero-length subject prefixes prettier
2011-05-30 Merge branch 'maint'
2011-05-30 Merge branch 'jm/maint-misc-fix' into maint
2011-05-30 Merge branch 'bc/maint-submodule-fix-parked' into maint
2011-05-30 Merge branch 'bc/maint-api-doc-parked' into maint
2011-05-30 Merge branch 'mk/grep-pcre'
2011-05-30 git-grep: Fix problems with recently added tests
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-29 builtin/commit.c: set status_format _after_ option...
2011-05-29 t7508: demonstrate status's failure to use --porcelain...
2011-05-27 rebase: write a reflog entry when finishing
2011-05-26 format-patch: preserve subject newlines with -k
2011-05-26 mailinfo: always clean up rfc822 header folding
2011-05-26 t: test subject handling in format-patch / am pipeline
2011-05-26 remote: allow "-t" with fetch mirrors
2011-05-26 Merge branch 'jn/userdiff-perl-updates'
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 Sync with 1.7.5.3
2011-05-26 Merge branch 'maint-1.7.4' 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 'jk/maint-upload-pack-shallow' 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-25 Merge branch 'maint'
2011-05-25 Teach read-tree the -n|--dry-run option
2011-05-25 init/clone: remove short option -L and document --separ...
2011-05-24 handle_options(): do not miscount how many arguments...
2011-05-24 config: always parse GIT_CONFIG_PARAMETERS during git_c...
2011-05-23 git-grep: Update tests (mainly for -P)
2011-05-23 userdiff/perl: tighten BEGIN/END block pattern to rejec...
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'
next