Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'maint' | Junio C Hamano | 2011-02-21 | 4 | -89/+12 |
|\ | |||||
| * | t/t7500-commit.sh: use test_cmp instead of test | Ævar Arnfjörð Bjarmason | 2011-02-21 | 1 | -1/+6 |
| * | t/gitweb-lib.sh: Ensure that errors are shown for --debug --immediate | Ævar Arnfjörð Bjarmason | 2011-02-21 | 3 | -88/+6 |
* | | Merge branch 'tr/merge-unborn-clobber' | Junio C Hamano | 2011-02-09 | 1 | -0/+16 |
|\ \ | |||||
| * | | Exhibit merge bug that clobbers index&WT | Thomas Rast | 2010-08-25 | 1 | -0/+16 |
* | | | Merge branch 'tr/diff-words-test' | Junio C Hamano | 2011-02-09 | 40 | -231/+917 |
|\ \ \ | |||||
| * | | | t4034 (diff --word-diff): add a minimum Perl drier test vector | Junio C Hamano | 2011-01-18 | 4 | -0/+58 |
| * | | | t4034 (diff --word-diff): style suggestions | Jonathan Nieder | 2011-01-18 | 1 | -245/+205 |
| * | | | t4034: bulk verify builtin word regex sanity | Thomas Rast | 2011-01-18 | 37 | -0/+668 |
* | | | | Merge branch 'rr/fi-import-marks-if-exists' | Junio C Hamano | 2011-02-09 | 1 | -0/+55 |
|\ \ \ \ | |||||
| * | | | | fast-import: Introduce --import-marks-if-exists | Ramkumar Ramachandra | 2011-01-18 | 1 | -0/+55 |
| |/ / / | |||||
* | | | | Merge branch 'ae/better-template-failure-report' | Junio C Hamano | 2011-02-09 | 1 | -0/+13 |
|\ \ \ \ | |||||
| * | | | | Improve error messages when temporary file creation fails | Arnout Engelen | 2010-12-21 | 1 | -0/+13 |
* | | | | | Merge branch 'jn/cherry-pick-strategy-option' | Junio C Hamano | 2011-02-09 | 1 | -0/+14 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | cherry-pick/revert: add support for -X/--strategy-option | Jonathan Nieder | 2010-12-28 | 1 | -0/+14 |
* | | | | | Merge branch 'maint-1.7.0' into maint | Junio C Hamano | 2011-02-09 | 1 | -0/+1 |
|\ \ \ \ \ | |||||
| * | | | | | fast-import: introduce "feature notes" command | Jonathan Nieder | 2011-02-09 | 1 | -0/+1 |
* | | | | | | diff: support --cached on unborn branches | Nguyễn Thái Ngọc Duy | 2011-02-07 | 3 | -0/+64 |
* | | | | | | t7407: fix line endings for mingw build | Pat Thoyts | 2011-02-07 | 1 | -0/+4 |
* | | | | | | t4120-apply-popt: help systems with core.filemode=false | Johannes Sixt | 2011-02-07 | 1 | -2/+7 |
* | | | | | | t3509: use unconstrained initial test to setup repository. | Pat Thoyts | 2011-02-07 | 1 | -2/+4 |
* | | | | | | Merge branch 'jl/fetch-submodule-recursive' into maint | Junio C Hamano | 2011-01-31 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t5526: Fix wrong argument order in "git config" | Jens Lehmann | 2011-01-31 | 1 | -1/+1 |
* | | | | | | | Merge branch 'maint' | Junio C Hamano | 2011-01-27 | 2 | -0/+45 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | tests: sanitize more git environment variables | Jeff King | 2011-01-27 | 1 | -0/+3 |
| * | | | | | | | Merge branch 'jn/fast-import-empty-tree-removal' into maint | Junio C Hamano | 2011-01-27 | 1 | -0/+42 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | fast-import: treat filemodify with empty tree as delete | Jonathan Nieder | 2011-01-27 | 1 | -0/+42 |
| * | | | | | | | | Merge branch 'tr/submodule-relative-scp-url' into maint | Junio C Hamano | 2011-01-19 | 1 | -0/+38 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'rj/maint-test-fixes' into maint | Junio C Hamano | 2011-01-19 | 4 | -23/+35 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jn/submodule-b-current' into maint | Junio C Hamano | 2011-01-19 | 1 | -5/+23 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-svn-info-test-fix' into maint | Junio C Hamano | 2011-01-19 | 1 | -72/+34 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jn/setup-fixes' | Junio C Hamano | 2011-01-24 | 3 | -4453/+703 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | t1510: fix typo in the comment of a test | Jonathan Nieder | 2011-01-24 | 1 | -1/+1 |
| * | | | | | | | | | | | | Subject: setup: officially support --work-tree without --git-dir | Jonathan Nieder | 2011-01-21 | 1 | -95/+115 |
| * | | | | | | | | | | | | tests: compress the setup tests | Jonathan Nieder | 2011-01-19 | 1 | -4401/+618 |
| * | | | | | | | | | | | | tests: cosmetic improvements to the repo-setup test | Jonathan Nieder | 2011-01-19 | 1 | -44/+50 |
| * | | | | | | | | | | | | t/README: hint about using $(pwd) rather than $PWD in tests | Johannes Sixt | 2011-01-11 | 1 | -0/+6 |
| * | | | | | | | | | | | | Fix expected values of setup tests on Windows | Johannes Sixt | 2011-01-11 | 2 | -1167/+1168 |
* | | | | | | | | | | | | | Merge branch 'jn/perl-funcname' | Junio C Hamano | 2011-01-13 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | diff: funcname and word patterns for perl | Jonathan Nieder | 2010-12-27 | 1 | -1/+1 |
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'rj/svn-test' | Junio C Hamano | 2011-01-13 | 1 | -17/+21 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | lib-git-svn.sh: Move web-server handling code into separate function | Ramsay Jones | 2011-01-04 | 1 | -17/+21 |
* | | | | | | | | | | | | | | Merge branch 'rj/test-fixes' | Junio C Hamano | 2011-01-13 | 3 | -2/+12 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | t4135-*.sh: Skip the "backslash" tests on cygwin | Ramsay Jones | 2011-01-08 | 1 | -1/+0 |
| * | | | | | | | | | | | | | | t3032-*.sh: Do not strip CR from line-endings while grepping on MinGW | Ramsay Jones | 2011-01-08 | 1 | -0/+1 |
| * | | | | | | | | | | | | | | t3032-*.sh: Pass the -b (--binary) option to sed on cygwin | Ramsay Jones | 2011-01-08 | 1 | -1/+3 |
| * | | | | | | | | | | | | | | t6038-*.sh: Pass the -b (--binary) option to sed on cygwin | Ramsay Jones | 2011-01-08 | 2 | -1/+9 |
* | | | | | | | | | | | | | | | Merge branch 'jn/t9010-work-around-broken-svnadmin' | Junio C Hamano | 2011-01-13 | 1 | -20/+15 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | t9010: svnadmin can fail even if available | Jonathan Nieder | 2011-01-10 | 1 | -20/+15 |
* | | | | | | | | | | | | | | | | Merge branch 'tr/submodule-relative-scp-url' | Junio C Hamano | 2011-01-13 | 1 | -0/+38 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | |