Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ap/status-ignored-in-ignored-directory' into maint | Junio C Hamano | 2013-01-28 | 1 | -0/+146 |
|\ | |||||
| * | git-status: Test --ignored behavior | Antoine Pelisse | 2013-01-01 | 1 | -0/+146 |
* | | Merge branch 'mh/ceiling' into maint | Junio C Hamano | 2013-01-28 | 2 | -58/+13 |
|\ \ | |||||
| * | | string_list_longest_prefix(): remove function | Michael Haggerty | 2012-10-29 | 1 | -30/+0 |
| * | | longest_ancestor_length(): require prefix list entries to be normalized | Michael Haggerty | 2012-10-29 | 1 | -28/+13 |
* | | | Merge branch 'rs/zip-tests' into maint | Junio C Hamano | 2013-01-20 | 5 | -80/+140 |
|\ \ \ | |||||
| * | | | t5003: check if unzip supports symlinks | René Scharfe | 2013-01-07 | 2 | -7/+19 |
| * | | | t5000, t5003: move ZIP tests into their own script | René Scharfe | 2013-01-07 | 2 | -69/+119 |
| * | | | t0024, t5000: use test_lazy_prereq for UNZIP | René Scharfe | 2013-01-07 | 2 | -14/+10 |
| * | | | t0024, t5000: clear variable UNZIP, use GIT_UNZIP instead | René Scharfe | 2013-01-06 | 3 | -8/+10 |
* | | | | Merge branch 'jk/unify-exit-code-by-receiving-signal' into maint | Junio C Hamano | 2013-01-14 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | run-command: encode signal death as a positive integer | Jeff King | 2013-01-06 | 1 | -1/+1 |
* | | | | | Merge branch 'jl/interrupt-clone-remove-separate-git-dir' into maint | Junio C Hamano | 2013-01-14 | 1 | -1/+11 |
|\ \ \ \ \ | |||||
| * | | | | | clone: support atomic operation with --separate-git-dir | Jens Lehmann | 2013-01-05 | 1 | -1/+11 |
* | | | | | | Merge branch 'mk/maint-graph-infinity-loop' into maint | Junio C Hamano | 2013-01-14 | 1 | -0/+10 |
|\ \ \ \ \ \ | |||||
| * | | | | | | graph.c: infinite loop in git whatchanged --graph -m | Michał Kiedrowicz | 2012-09-25 | 1 | -0/+10 |
* | | | | | | | Merge branch 'jk/enable-test-lint-by-default' into maint | Junio C Hamano | 2013-01-11 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | tests: turn on test-lint by default | Jeff King | 2013-01-03 | 1 | -0/+1 |
* | | | | | | | | Merge branch 'ap/merge-stop-at-prepare-commit-msg-failure' into maint | Junio C Hamano | 2013-01-11 | 1 | -0/+14 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | merge: Honor prepare-commit-msg return code | Antoine Pelisse | 2013-01-03 | 1 | -0/+14 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ \ |