summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Makefile: whitespace style fixes in macro definitionsStefano Lattarini2012-12-101-1/+1
* Merge branch 'rr/t4041-cleanup'Junio C Hamano2012-12-071-249/+248
|\
| * t4041 (diff-submodule-option): modernize styleRamkumar Ramachandra2012-12-021-230/+229
| * t4041 (diff-submodule-option): rewrite add_file() routineRamkumar Ramachandra2012-12-021-12/+12
| * t4041 (diff-submodule-option): parse digests sensiblyRamkumar Ramachandra2012-12-021-7/+7
| * t4041 (diff-submodule-option): don't hardcode SHA-1 in expected outputsRamkumar Ramachandra2012-11-271-5/+5
* | Merge branch 'pw/p4-various-fixes'Junio C Hamano2012-11-292-1/+59
|\ \
| * | git p4 test: display unresolvable host errorPete Wyckoff2012-11-261-0/+12
| * | git p4: catch p4 errors when streaming file contentsPete Wyckoff2012-11-261-1/+12
| * | git p4: handle servers without move supportPete Wyckoff2012-11-261-0/+35
| |/
* | Merge branch 'lt/diff-stat-show-0-lines'Junio C Hamano2012-11-291-3/+45
|\ \
| * | t4049: refocus testsJunio C Hamano2012-11-291-11/+9
| * | diff --stat: do not count "unmerged" entriesJunio C Hamano2012-11-271-1/+1
| * | diff --stat: move the "total count" logic to the last loopJunio C Hamano2012-11-271-1/+1
| * | test: add failing tests for "diff --stat" to t4049Junio C Hamano2012-11-271-1/+45
* | | Merge branch 'fc/remote-hg'Junio C Hamano2012-11-291-1/+2
|\ \ \
| * | | test-lib: avoid full path to store test resultsFelipe Contreras2012-11-041-1/+2
* | | | Merge branch 'jk/send-email-sender-prompt'Junio C Hamano2012-11-296-12/+136
|\ \ \ \
| * | | | t9001: check send-email behavior with implicit senderJeff King2012-11-281-0/+28
| * | | | Merge branch 'fc/send-email-no-sender-prompt' into jk/send-email-sender-promptJunio C Hamano2012-11-281-3/+2
| |\ \ \ \
| * | | | | t: add tests for "git var"Jeff King2012-11-281-0/+49
| * | | | | t7502: factor out autoident prerequisiteJeff King2012-11-152-11/+7
| * | | | | test-lib: allow negation of prerequisitesJeff King2012-11-152-1/+52
* | | | | | Merge branch 'fc/send-email-no-sender-prompt'Junio C Hamano2012-11-291-3/+2
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | send-email: avoid questions when user has an identFelipe Contreras2012-11-261-3/+2
| |/ / / /
* | | | | Merge branch 'jl/submodule-rm'Junio C Hamano2012-11-291-0/+17
|\ \ \ \ \
| * | | | | Teach rm to remove submodules when given with a trailing '/'Jens Lehmann2012-11-231-0/+17
* | | | | | Merge branch 'fc/completion-test-simplification'Junio C Hamano2012-11-291-82/+52
|\ \ \ \ \ \
| * | | | | | completion: simplify __gitcomp() test helperFelipe Contreras2012-11-161-10/+5
| * | | | | | completion: refactor __gitcomp related testsFelipe Contreras2012-11-161-50/+28
| * | | | | | completion: consolidate test_completion*() testsFelipe Contreras2012-11-161-17/+14
| * | | | | | completion: simplify tests using test_completion_long()Felipe Contreras2012-11-161-6/+3
| * | | | | | completion: standardize final space marker in testsFelipe Contreras2012-11-161-14/+13
| * | | | | | completion: add comment for test_completion()Felipe Contreras2012-11-161-1/+5
* | | | | | | Merge branch 'mm/status-push-pull-advise'Junio C Hamano2012-11-281-0/+1
|\ \ \ \ \ \ \
| * | | | | | | status: add advice on how to push/pull to tracking branchMatthieu Moy2012-11-161-0/+1
* | | | | | | | Merge branch 'jk/pickaxe-textconv'Junio C Hamano2012-11-281-0/+12
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | pickaxe: use textconv for -S countingJeff King2012-10-281-0/+12
* | | | | | | | Merge branch 'rr/submodule-diff-config'Junio C Hamano2012-11-251-1/+43
|\ \ \ \ \ \ \ \
| * | | | | | | | diff: rename "set" variableJeff King2012-11-181-0/+15
| * | | | | | | | diff: introduce diff.submodule configuration variableRamkumar Ramachandra2012-11-181-1/+28
* | | | | | | | | Merge branch 'jh/update-ref-d-through-symref'Junio C Hamano2012-11-251-0/+18
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix failure to delete a packed ref through a symrefJohan Herland2012-10-211-1/+1
| * | | | | | | | | t1400-update-ref: Add test verifying bug with symrefs in delete_ref()Johan Herland2012-10-211-0/+18
* | | | | | | | | | Merge branch 'lt/diff-stat-show-0-lines'Junio C Hamano2012-11-253-26/+27
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Fix "git diff --stat" for interesting - but empty - file changesLinus Torvalds2012-10-173-26/+27
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/config-ignore-duplicates'Junio C Hamano2012-11-212-131/+188
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-config: do not complain about duplicate entriesJeff King2012-10-242-4/+5
| * | | | | | | | | t1300: test "git config --get-all" more thoroughlyJeff King2012-10-241-2/+7
| * | | | | | | | | t1300: remove redundant testJeff King2012-10-241-4/+0