summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'aw/rebase-i-p'Junio C Hamano2011-07-133-3/+29
|\
| * rebase -i -p: include non-first-parent commits in todo listAndrew Wong2011-06-193-3/+29
* | Merge branch 'jc/no-gitweb-test-without-cgi-etc'Junio C Hamano2011-07-131-0/+5
|\ \
| * | t/gitweb-lib.sh: skip gitweb tests when perl dependencies are not metJunio C Hamano2011-06-151-0/+5
| |/
* | Merge branch 'fg/submodule-keep-updating'Junio C Hamano2011-07-131-0/+144
|\ \
| * | submodule update: continue when a checkout failsFredrik Gustafsson2011-06-131-0/+144
| |/
* | Merge branch 'jc/streaming-filter' into nextJunio C Hamano2011-06-291-17/+34
|\ \
| * | t0021: test application of both crlf and identJunio C Hamano2011-05-261-8/+24
| * | t0021-conversion.sh: fix NoTerminatingSymbolAtEOF testRené Scharfe2011-05-261-11/+12
| | |
| | \
| | \
| | \
| *---. \ Merge branches 'jc/convert', 'jc/bigfile' and 'jc/replacing' into jc/streamingJunio C Hamano2011-05-152-2/+43
| |\ \ \ \
* | \ \ \ \ Merge branch 'da/git-prefix-everywhere' into nextJunio C Hamano2011-06-292-0/+49
|\ \ \ \ \ \
| * | | | | | t/t7503-pre-commit-hook.sh: Add GIT_PREFIX testsDavid Aguilar2011-06-021-0/+33
| * | | | | | setup: Provide GIT_PREFIX to built-insDavid Aguilar2011-05-261-0/+16
* | | | | | | Merge branch 'ab/i18n-scripts' into nextJunio C Hamano2011-06-296-14/+15
|\ \ \ \ \ \ \
| * | | | | | | i18n: git-submodule "blob" and "submodule" messagesÆvar Arnfjörð Bjarmason2011-05-211-4/+4
| * | | | | | | i18n: git-submodule "path not initialized" messageÆvar Arnfjörð Bjarmason2011-05-211-1/+1
| * | | | | | | i18n: git-submodule "[...] path is ignored" messageÆvar Arnfjörð Bjarmason2011-05-211-1/+1
| * | | | | | | i18n: git-submodule "Entering [...]" messageÆvar Arnfjörð Bjarmason2011-05-211-2/+2
| * | | | | | | i18n: git-submodule $errmsg messagesÆvar Arnfjörð Bjarmason2011-05-211-1/+1
| * | | | | | | i18n: git-submodule "Submodule change[...]" messagesÆvar Arnfjörð Bjarmason2011-05-211-1/+1
| * | | | | | | i18n: git-submodule $update_module say + die messagesÆvar Arnfjörð Bjarmason2011-05-211-1/+1
| * | | | | | | i18n: git-am core say messagesÆvar Arnfjörð Bjarmason2011-05-212-3/+4
* | | | | | | | Merge branch 'rs/grep-color'Junio C Hamano2011-06-291-0/+95
|\ \ \ \ \ \ \ \
| * | | | | | | | grep: add --headingRené Scharfe2011-06-051-0/+37
| * | | | | | | | grep: add --breakRené Scharfe2011-06-051-0/+28
| * | | | | | | | grep: fix coloring of hunk marks between filesRené Scharfe2011-06-051-0/+30
* | | | | | | | | Merge branch 'jc/maint-1.7.3-checkout-describe'Junio C Hamano2011-06-291-0/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | checkout -b <name>: correctly detect existing branchJunio C Hamano2011-06-051-0/+11
* | | | | | | | | | Merge branch 'jk/maint-1.7.2-status-ignored'Junio C Hamano2011-06-291-0/+121
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git status --ignored: tests and docsJunio C Hamano2011-06-021-0/+121
* | | | | | | | | | | Merge branch 'mg/diff-stat-count'Junio C Hamano2011-06-291-0/+25
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | diff --stat-count: finishing touchesJunio C Hamano2011-05-271-0/+25
* | | | | | | | | | | | Merge branch 'jk/combine-diff-binary-etc'Junio C Hamano2011-06-291-0/+212
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | combine-diff: respect textconv attributesJeff King2011-05-241-0/+99
| * | | | | | | | | | | | combine-diff: handle binary files as binaryJeff King2011-05-231-0/+113
* | | | | | | | | | | | | Merge git://bogomips.org/git-svn into maintJunio C Hamano2011-06-291-0/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | git-svn: Correctly handle root commits in mergeinfo rangesMichael Haggerty2011-06-281-1/+1
| * | | | | | | | | | | | | git-svn: Demonstrate a bug with root commits in mergeinfo rangesMichael Haggerty2011-06-281-0/+33
* | | | | | | | | | | | | | Merge branch 'maint-1.7.5' into maintJunio C Hamano2011-06-291-2/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | test: skip clean-up when running under --immediate modeJunio C Hamano2011-06-291-2/+10
| * | | | | | | | | | | | | Merge branch 'jk/maint-config-alias-fix' into maintJunio C Hamano2011-06-011-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ml/test-readme' into maintJunio C Hamano2011-05-311-8/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ab/i18n-fixup' into maintJunio C Hamano2011-05-3136-363/+343
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/rename-degrade-cc-to-c' into maintJunio C Hamano2011-05-311-0/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/run-command-error-failure' into maintJunio C Hamano2011-05-291-0/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mk/grep-pcre'Junio C Hamano2011-06-201-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | t7810: avoid unportable use of "echo"Junio C Hamano2011-06-201-3/+3
* | | | | | | | | | | | | | | | | | | | Merge branch 'di/no-no-existant'Junio C Hamano2011-06-196-13/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Fix typo: existant->existentDmitry Ivankov2011-06-166-13/+13
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | tests: link shell libraries into valgrind directoryJeff King2011-06-171-2/+7