Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'as/test-name-alias-uniquely' into maint | Junio C Hamano | 2013-01-11 | 1 | -6/+6 |
|\ | |||||
| * | Use longer alias names in subdirectory tests | Aaron Schrab | 2012-12-28 | 1 | -6/+6 |
* | | Merge branch 'ja/directory-attrs' into maint | Junio C Hamano | 2013-01-11 | 1 | -0/+57 |
|\ \ | |||||
| * | | Add directory pattern matching to attributes | Jean-Noël AVILA | 2012-12-17 | 1 | -0/+57 |
* | | | Merge branch 'jc/fetch-ignore-symref' into maint | Junio C Hamano | 2013-01-11 | 1 | -0/+42 |
|\ \ \ | |||||
| * | | | fetch: ignore wildcarded refspecs that update local symbolic refs | Junio C Hamano | 2012-12-11 | 1 | -0/+42 |
* | | | | Merge branch 'tb/test-t9810-no-sed-i' into maint | Junio C Hamano | 2013-01-10 | 1 | -10/+14 |
|\ \ \ \ | |||||
| * | | | | t9810: Do not use sed -i | Torsten Bögershausen | 2013-01-01 | 1 | -10/+14 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'tb/test-t9020-no-which' into maint | Junio C Hamano | 2013-01-10 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | t9020: which is not portable | Torsten Bögershausen | 2013-01-01 | 1 | -2/+2 |
* | | | | | Merge branch 'sp/shortlog-missing-lf' into maint | Junio C Hamano | 2013-01-10 | 1 | -0/+24 |
|\ \ \ \ \ | |||||
| * | | | | | shortlog: fix wrapping lines of wraplen | Steffen Prohaska | 2012-12-11 | 1 | -0/+24 |
* | | | | | | Merge branch 'nd/invalidate-i-t-a-cache-tree' into maint | Junio C Hamano | 2013-01-10 | 1 | -0/+20 |
|\ \ \ \ \ \ | |||||
| * | | | | | | cache-tree: invalidate i-t-a paths after generating trees | Nguyễn Thái Ngọc Duy | 2012-12-15 | 1 | -0/+20 |
* | | | | | | | t1402: work around shell quoting issue on NetBSD | René Scharfe | 2013-01-08 | 1 | -2/+4 |
* | | | | | | | Merge branch 'jc/test-portability' into maint | Junio C Hamano | 2013-01-08 | 2 | -6/+10 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t9020: use configured Python to run the test helper | Junio C Hamano | 2012-12-19 | 1 | -3/+7 |
| * | | | | | | | t3600: Avoid "cp -a", which is a GNUism | Junio C Hamano | 2012-12-19 | 1 | -3/+3 |
| * | | | | | | | Merge branch 'jc/maint-test-portability' into 'jc/test-portability' | Junio C Hamano | 2012-12-19 | 3 | -6/+8 |
| |\ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ | Merge branch 'jc/test-cvs-no-init-in-existing-dir' into maint | Junio C Hamano | 2013-01-08 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | t9200: let "cvs init" create the test repository | Junio C Hamano | 2012-12-24 | 1 | -1/+2 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'jc/maint-test-portability' into maint | Junio C Hamano | 2013-01-08 | 3 | -6/+8 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | / / / / / / | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | t4014: fix arguments to grep | Junio C Hamano | 2012-12-19 | 1 | -3/+3 |
| * | | | | | | | t9502: do not assume GNU tar | Junio C Hamano | 2012-12-19 | 1 | -1/+1 |
| * | | | | | | | t0200: "locale" may not exist | Junio C Hamano | 2012-12-19 | 1 | -2/+4 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'maint' | Junio C Hamano | 2012-12-18 | 1 | -1/+4 |
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | t7004: do not create unneeded gpghome/gpg.conf when GPG is not used | Junio C Hamano | 2012-12-18 | 1 | -1/+4 |
| * | | | | | Merge branch 'jk/pickaxe-textconv' into maint | Junio C Hamano | 2012-12-18 | 1 | -0/+12 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Merge branch 'lt/diff-stat-show-0-lines' into maint | Junio C Hamano | 2012-12-07 | 3 | -28/+71 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'pw/maint-p4-rcs-expansion-newline' into maint | Junio C Hamano | 2012-11-28 | 1 | -0/+19 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'jh/update-ref-d-through-symref' into maint | Junio C Hamano | 2012-11-27 | 1 | -0/+18 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'cn/config-missing-path' into maint | Junio C Hamano | 2012-11-25 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jk/maint-gitweb-xss' into maint | Junio C Hamano | 2012-11-25 | 1 | -0/+15 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jk/maint-diff-grep-textconv' into maint | Junio C Hamano | 2012-11-20 | 1 | -0/+12 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/format-2047' into maint | Junio C Hamano | 2012-11-20 | 2 | -87/+148 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/branch-del-symref' into maint | Junio C Hamano | 2012-11-18 | 1 | -0/+19 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/grep-true-path' into maint | Junio C Hamano | 2012-11-18 | 1 | -0/+22 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/grep-pcre-loose-ends' (early part) into maint | Junio C Hamano | 2012-11-18 | 1 | -0/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/test-say-color-avoid-echo-escape' into maint | Junio C Hamano | 2012-11-18 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | | | | | | | | Makefile: whitespace style fixes in macro definitions | Stefano Lattarini | 2012-12-10 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | Merge branch 'rr/t4041-cleanup' | Junio C Hamano | 2012-12-07 | 1 | -249/+248 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | t4041 (diff-submodule-option): modernize style | Ramkumar Ramachandra | 2012-12-02 | 1 | -230/+229 |
| * | | | | | | | | | | | | | | | | | t4041 (diff-submodule-option): rewrite add_file() routine | Ramkumar Ramachandra | 2012-12-02 | 1 | -12/+12 |
| * | | | | | | | | | | | | | | | | | t4041 (diff-submodule-option): parse digests sensibly | Ramkumar Ramachandra | 2012-12-02 | 1 | -7/+7 |
| * | | | | | | | | | | | | | | | | | t4041 (diff-submodule-option): don't hardcode SHA-1 in expected outputs | Ramkumar Ramachandra | 2012-11-27 | 1 | -5/+5 |
* | | | | | | | | | | | | | | | | | | Merge branch 'pw/p4-various-fixes' | Junio C Hamano | 2012-11-29 | 2 | -1/+59 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | git p4 test: display unresolvable host error | Pete Wyckoff | 2012-11-26 | 1 | -0/+12 |
| * | | | | | | | | | | | | | | | | | | git p4: catch p4 errors when streaming file contents | Pete Wyckoff | 2012-11-26 | 1 | -1/+12 |
| * | | | | | | | | | | | | | | | | | | git p4: handle servers without move support | Pete Wyckoff | 2012-11-26 | 1 | -0/+35 |
| |/ / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | Merge branch 'lt/diff-stat-show-0-lines' | Junio C Hamano | 2012-11-29 | 1 | -3/+45 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | |