Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'maint' | Junio C Hamano | 2014-07-02 | 1 | -2/+2 |
|\ | |||||
| * | Merge branch 'maint-1.8.5' into maint | Junio C Hamano | 2014-07-02 | 1 | -2/+2 |
| |\ | |||||
| | * | t7300: repair filesystem permissions with test_when_finished | Jeff King | 2014-07-02 | 1 | -2/+2 |
| * | | Merge branch 'na/no-http-test-in-the-middle' into maint | Junio C Hamano | 2014-06-25 | 2 | -59/+100 |
| |\ \ | |||||
| * \ \ | Merge branch 'jl/status-added-submodule-is-never-ignored' into maint | Junio C Hamano | 2014-06-25 | 1 | -2/+72 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'mk/show-s-no-extra-blank-line-for-merges' into maint | Junio C Hamano | 2014-06-25 | 3 | -10/+13 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'rr/rebase-autostash-fix' into maint | Junio C Hamano | 2014-06-25 | 1 | -0/+15 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'jc/shortlog-ref-exclude' into maint | Junio C Hamano | 2014-06-25 | 1 | -0/+6 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'dt/merge-recursive-case-insensitive' into maint | Junio C Hamano | 2014-06-25 | 1 | -0/+53 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'jk/diff-files-assume-unchanged' into maint | Junio C Hamano | 2014-06-25 | 1 | -0/+11 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jk/commit-C-pick-empty' into maint | Junio C Hamano | 2014-06-25 | 1 | -1/+10 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'bc/blame-crlf-test' into maint | Junio C Hamano | 2014-06-25 | 1 | -0/+9 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/apply-ignore-whitespace' into maint | Junio C Hamano | 2014-06-25 | 1 | -8/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'as/pretty-truncate' into maint | Junio C Hamano | 2014-06-25 | 4 | -71/+276 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/rev-parse-argh-dashed-multi-words' into maint | Junio C Hamano | 2014-06-12 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ep/avoid-test-a-o' | Junio C Hamano | 2014-06-25 | 8 | -18/+18 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | t/test-lib-functions.sh: avoid "test <cond> -a/-o <cond>" | Elia Pinto | 2014-06-09 | 1 | -2/+2 |
| * | | | | | | | | | | | | | | | t/t9814-git-p4-rename.sh: avoid "test <cond> -a/-o <cond>" | Elia Pinto | 2014-06-09 | 1 | -2/+2 |
| * | | | | | | | | | | | | | | | t/t5538-push-shallow.sh: avoid "test <cond> -a/-o <cond>" | Elia Pinto | 2014-06-09 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | t/t5403-post-checkout-hook.sh: avoid "test <cond> -a/-o <cond>" | Elia Pinto | 2014-06-09 | 1 | -4/+4 |
| * | | | | | | | | | | | | | | | t/t5000-tar-tree.sh: avoid "test <cond> -a/-o <cond>" | Elia Pinto | 2014-06-09 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | t/t4102-apply-rename.sh: avoid "test <cond> -a/-o <cond>" | Elia Pinto | 2014-06-09 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | t/t0026-eol-config.sh: avoid "test <cond> -a/-o <cond>" | Elia Pinto | 2014-06-09 | 1 | -4/+4 |
| * | | | | | | | | | | | | | | | t/t0025-crlf-auto.sh: avoid "test <cond> -a/-o <cond>" | Elia Pinto | 2014-06-09 | 1 | -3/+3 |
| * | | | | | | | | | | | | | | | t/lib-httpd.sh: avoid "test <cond> -a/-o <cond>" | Elia Pinto | 2014-06-09 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | Merge branch 'pb/trim-trailing-spaces' | Junio C Hamano | 2014-06-25 | 1 | -6/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | t0008: do not depend on 'echo' handling backslashes speciallypb/trim-trailing-spaces | Junio C Hamano | 2014-06-13 | 1 | -6/+8 |
* | | | | | | | | | | | | | | | | | Merge branch 'sp/complete-ext-alias' | Junio C Hamano | 2014-06-25 | 1 | -0/+27 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | completion: handle '!f() { ... }; f' and "!sh -c '...' -" aliasessp/complete-ext-alias | Steffen Prohaska | 2014-06-13 | 1 | -0/+27 |
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/repack-pack-writebitmaps-config' | Junio C Hamano | 2014-06-25 | 3 | -3/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | t7700: drop explicit --no-pack-kept-objects from .keep testjk/repack-pack-writebitmaps-config | Jeff King | 2014-06-12 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | | repack: introduce repack.writeBitmaps config option | Jeff King | 2014-06-10 | 3 | -2/+5 |
* | | | | | | | | | | | | | | | | | | | Merge branch 'nd/init-restore-env' | Junio C Hamano | 2014-06-25 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | git potty: restore environments after alias expansionnd/init-restore-env | Nguyễn Thái Ngọc Duy | 2014-06-10 | 1 | -2/+2 |
| | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'jk/repack-pack-keep-objects' | Junio C Hamano | 2014-06-25 | 1 | -2/+18 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | repack: respect pack.writebitmaps | Jeff King | 2014-06-10 | 1 | -1/+17 |
| * | | | | | | | | | | | | | | | | | | repack: do not accidentally pack kept objects by default | Jeff King | 2014-06-10 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | Merge branch 'jc/test-lazy-prereq' (early part) | Junio C Hamano | 2014-06-20 | 5 | -78/+85 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | t3419: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite | Junio C Hamano | 2014-06-09 | 1 | -14/+8 |
| * | | | | | | | | | | | | | | | | | | | t3302: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite | Junio C Hamano | 2014-06-09 | 1 | -6/+4 |
| * | | | | | | | | | | | | | | | | | | | t3302: do not chdir around in the primary test process | Junio C Hamano | 2014-06-09 | 1 | -9/+18 |
| * | | | | | | | | | | | | | | | | | | | t3302: coding style updates | Junio C Hamano | 2014-06-09 | 1 | -43/+47 |
| * | | | | | | | | | | | | | | | | | | | test: turn USR_BIN_TIME into a lazy prerequisite | Junio C Hamano | 2014-06-09 | 3 | -2/+4 |
| * | | | | | | | | | | | | | | | | | | | test: turn EXPENSIVE into a lazy prerequisite | Junio C Hamano | 2014-06-09 | 3 | -4/+4 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'jc/fetch-pull-refmap' | Junio C Hamano | 2014-06-20 | 1 | -0/+37 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | fetch: allow explicit --refmap to override configurationjc/fetch-push-refmap | Junio C Hamano | 2014-06-05 | 1 | -0/+37 |
| | |_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'mt/send-email-cover-to-cc' | Junio C Hamano | 2014-06-20 | 1 | -0/+45 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | t9001: avoid non-portable '\n' with sedmt/send-email-cover-to-cc | Torsten Bögershausen | 2014-06-10 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | | | test/send-email: to-cover, cc-cover tests | Michael S. Tsirkin | 2014-04-29 | 1 | -0/+45 |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'tb/t5551-clone-notice-to-stderr' | Junio C Hamano | 2014-06-20 | 1 | -2/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |