Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'nd/t1509-chroot-test' into maint | Junio C Hamano | 2015-05-13 | 1 | -9/+29 |
|\ | |||||
| * | t1509: update prepare script to be able to run t1509 in chroot againnd/t1509-chroot-test | Nguyễn Thái Ngọc Duy | 2015-04-18 | 1 | -9/+29 |
* | | Merge branch 'jk/type-from-string-gently' into maint | Junio C Hamano | 2015-05-13 | 1 | -0/+8 |
|\ \ | |||||
| * | | type_from_string_gently: make sure length matchesjk/type-from-string-gently | Jeff King | 2015-04-17 | 1 | -0/+8 |
* | | | Merge branch 'ep/fix-test-lib-functions-report' into maint | Junio C Hamano | 2015-05-13 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | test-lib-functions.sh: fix the second argument to some helper functionsep/fix-test-lib-functions-report | Elia Pinto | 2015-04-16 | 1 | -2/+2 |
* | | | | Merge branch 'cn/bom-in-gitignore' into maint | Junio C Hamano | 2015-05-13 | 1 | -0/+9 |
|\ \ \ \ | |||||
| * | | | | dir: allow a BOM at the beginning of exclude files | Carlos Martín Nieto | 2015-04-16 | 1 | -0/+9 |
* | | | | | Sync with 2.3.8 | Junio C Hamano | 2015-05-11 | 2 | -4/+38 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'mm/usage-log-l-can-take-regex' into maint-2.3 | Junio C Hamano | 2015-05-11 | 1 | -4/+4 |
| |\ \ \ \ \ | |||||
| | * | | | | | log -L: improve error message on malformed argumentmm/usage-log-l-can-take-regex | Matthieu Moy | 2015-04-20 | 1 | -4/+4 |
| * | | | | | | Merge branch 'jc/diff-no-index-d-f' into maint-2.3 | Junio C Hamano | 2015-05-11 | 1 | -0/+34 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | diff-no-index: align D/F handling with that of normal Gitjc/diff-no-index-d-f | Junio C Hamano | 2015-03-26 | 1 | -0/+12 |
| | * | | | | | | diff-no-index: DWIM "diff D F" into "diff D/F F" | Junio C Hamano | 2015-03-25 | 1 | -0/+22 |
| | | |_|_|_|/ | | |/| | | | | |||||
| * | | | | | | Merge branch 'tb/connect-ipv6-parse-fix' into maint | Junio C Hamano | 2015-04-27 | 2 | -16/+22 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'jk/test-annoyances' into maint | Junio C Hamano | 2015-04-21 | 5 | -15/+24 |
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||||
| * | | | | | | | Merge branch 'tg/test-index-v4' into maint | Junio C Hamano | 2015-03-28 | 1 | -3/+12 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'ct/prompt-untracked-fix' into maint | Junio C Hamano | 2015-03-28 | 1 | -0/+11 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jk/fetch-pack' into maint | Junio C Hamano | 2015-03-28 | 1 | -3/+10 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jk/prune-with-corrupt-refs' into maint | Junio C Hamano | 2015-03-28 | 1 | -0/+114 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/smart-http-hide-refs' into maint | Junio C Hamano | 2015-03-27 | 1 | -0/+11 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sg/completion-remote' into maint | Junio C Hamano | 2015-03-23 | 1 | -0/+19 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/decorate-leaky-separator-color' into maint | Junio C Hamano | 2015-03-23 | 1 | -8/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'kn/git-cd-to-empty' into maint | Junio C Hamano | 2015-03-23 | 1 | -0/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mg/verify-commit' into maint | Junio C Hamano | 2015-03-23 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'es/rebase-i-count-todo' into maint | Junio C Hamano | 2015-03-23 | 1 | -0/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tb/connect-ipv6-parse-fix' into maint | Junio C Hamano | 2015-03-23 | 2 | -36/+74 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tb/connect-ipv6-parse-fix' | Junio C Hamano | 2015-04-20 | 2 | -16/+22 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | connect.c: ignore extra colon after hostnametb/connect-ipv6-parse-fix | Torsten Bögershausen | 2015-04-08 | 2 | -16/+22 |
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | Merge branch 'va/fix-git-p4-tests' | Junio C Hamano | 2015-04-20 | 1 | -12/+31 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | t9814: guarantee only one source exists in git-p4 copy tests | Vitor Antunes | 2015-04-12 | 1 | -15/+31 |
| * | | | | | | | | | | | | | | | | | | git-p4: fix copy detection test | Vitor Antunes | 2015-03-28 | 1 | -1/+4 |
| * | | | | | | | | | | | | | | | | | | t9814: fix broken shell syntax in git-p4 rename test | Vitor Antunes | 2015-03-28 | 1 | -2/+2 |
* | | | | | | | | | | | | | | | | | | | Merge branch 'jc/update-instead-into-void' | Junio C Hamano | 2015-04-14 | 1 | -1/+54 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | push-to-deploy: allow pushing into an unborn branch and updating itjc/update-instead-into-void | Junio C Hamano | 2015-04-01 | 1 | -1/+54 |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/test-chain-lint' | Junio C Hamano | 2015-03-26 | 102 | -773/+459 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | t9001: drop save_confirm helper | Jeff King | 2015-03-25 | 1 | -10/+5 |
| * | | | | | | | | | | | | | | | | | | | | t0020: use test_* helpers instead of hand-rolled messages | Jeff King | 2015-03-25 | 1 | -33/+5 |
| * | | | | | | | | | | | | | | | | | | | | t: simplify loop exit-code status variables | Jeff King | 2015-03-25 | 2 | -16/+6 |
| * | | | | | | | | | | | | | | | | | | | | t: fix some trivial cases of ignored exit codes in loops | Jeff King | 2015-03-25 | 10 | -28/+24 |
| * | | | | | | | | | | | | | | | | | | | | t7701: fix ignored exit code inside loop | Jeff King | 2015-03-25 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | | | | t3305: fix ignored exit code inside loop | Jeff King | 2015-03-25 | 1 | -6/+3 |
| * | | | | | | | | | | | | | | | | | | | | t0020: fix ignored exit code inside loops | Jeff King | 2015-03-25 | 1 | -35/+19 |
| * | | | | | | | | | | | | | | | | | | | | perf-lib: fix ignored exit code inside loop | Jeff King | 2015-03-25 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | | | | t6039: fix broken && chain | Torsten Bögershausen | 2015-03-22 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | | | | t9158, t9161: fix broken &&-chain in git-svn tests | Michael J Gruber | 2015-03-20 | 2 | -7/+7 |
| * | | | | | | | | | | | | | | | | | | | | t9104: fix test for following larger parents | Michael J Gruber | 2015-03-20 | 1 | -4/+6 |
| * | | | | | | | | | | | | | | | | | | | | t4104: drop hand-rolled error reporting | Jeff King | 2015-03-20 | 1 | -8/+2 |
| * | | | | | | | | | | | | | | | | | | | | t0005: fix broken &&-chains | Jeff King | 2015-03-20 | 1 | -2/+2 |
| * | | | | | | | | | | | | | | | | | | | | t7004: fix embedded single-quotes | Jeff King | 2015-03-20 | 1 | -1/+1 |