Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jl/test-lint-scripts' | Junio C Hamano | 2014-07-16 | 1 | -2/+3 |
|\ | |||||
| * | t/Makefile: always test all lint targets when running testsjl/test-lint-scripts | Jens Lehmann | 2014-07-10 | 1 | -1/+1 |
| * | t/Makefile: check helper scripts for non-portable shell commands too | Jens Lehmann | 2014-07-10 | 1 | -1/+2 |
* | | Merge branch 'zk/log-graph-showsig' | Junio C Hamano | 2014-07-16 | 1 | -0/+31 |
|\ \ | |||||
| * | | log: fix indentation for --graph --show-signaturezk/log-graph-showsig | Zoltan Klinger | 2014-07-09 | 1 | -0/+31 |
* | | | Merge branch 'cb/filter-branch-prune-empty-degenerate-merges' | Junio C Hamano | 2014-07-16 | 1 | -0/+11 |
|\ \ \ | |||||
| * | | | filter-branch: eliminate duplicate mapped parentscb/filter-branch-prune-empty-degenerate-merges | Charles Bailey | 2014-07-01 | 1 | -0/+11 |
* | | | | Merge branch 'mk/merge-incomplete-files' | Junio C Hamano | 2014-07-16 | 1 | -3/+88 |
|\ \ \ \ | |||||
| * | | | | git-merge-file: do not add LF at EOF while applying unrelated changemk/merge-incomplete-files | Max Kirillov | 2014-06-30 | 1 | -0/+85 |
| * | | | | t6023-merge-file.sh: fix and mark as broken invalid tests | Max Kirillov | 2014-06-30 | 1 | -3/+3 |
* | | | | | Merge branch 'tb/crlf-tests' | Junio C Hamano | 2014-07-16 | 2 | -61/+326 |
|\ \ \ \ \ | |||||
| * | | | | | t0027: combinations of core.autocrlf, core.eol and text | Torsten Bögershausen | 2014-07-08 | 1 | -0/+265 |
| * | | | | | t0025: rename the test files | Torsten Bögershausen | 2014-07-08 | 1 | -61/+61 |
| |/ / / / | |||||
* | | | | | Merge branch 'nd/split-index' | Junio C Hamano | 2014-07-16 | 2 | -0/+196 |
|\ \ \ \ \ | |||||
| * | | | | | t1700: new tests for split-index mode | Nguyễn Thái Ngọc Duy | 2014-06-13 | 1 | -0/+194 |
| * | | | | | t2104: make sure split index mode is off for the version test | Nguyễn Thái Ngọc Duy | 2014-06-13 | 1 | -0/+2 |
* | | | | | | Merge branch 'dt/refs-check-refname-component-sse-fix' | Junio C Hamano | 2014-07-10 | 1 | -4/+11 |
|\ \ \ \ \ \ | |||||
| * | | | | | | refs: fix valgrind suppression filedt/refs-check-refname-component-sse-fix | David Turner | 2014-07-08 | 1 | -4/+11 |
* | | | | | | | Merge branch 'rs/simplify-archive-tests' | Junio C Hamano | 2014-07-10 | 2 | -16/+8 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t5000, t5003: simplify commitrs/simplify-archive-tests | René Scharfe | 2014-07-07 | 2 | -16/+8 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch 'mg/verify-commit' | Junio C Hamano | 2014-07-10 | 1 | -1/+19 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t7510: test verify-commit | Michael J Gruber | 2014-06-23 | 1 | -1/+19 |
| * | | | | | | | t7510: exit for loop with test result | Michael J Gruber | 2014-06-23 | 1 | -2/+2 |
* | | | | | | | | Merge branch 'jk/pretty-G-format-fixes' | Junio C Hamano | 2014-07-09 | 2 | -9/+68 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | move "%G" format test from t7510 to t6006jk/pretty-G-format-fixes | Jeff King | 2014-06-25 | 2 | -6/+6 |
| * | | | | | | | pretty: avoid reading past end-of-string with "%G" | Jeff King | 2014-06-17 | 1 | -0/+6 |
| * | | | | | | | t7510: check %G* pretty-format output | Jeff King | 2014-06-17 | 1 | -0/+40 |
| * | | | | | | | t7510: test a commit signed by an unknown key | Jeff King | 2014-06-17 | 1 | -0/+13 |
| * | | | | | | | t7510: use consistent &&-chains in loop | Michael J Gruber | 2014-06-17 | 1 | -6/+6 |
| * | | | | | | | t7510: stop referring to master in later tests | Jeff King | 2014-06-17 | 1 | -3/+3 |
* | | | | | | | | Merge branch 'dt/refs-check-refname-component-sse' | Junio C Hamano | 2014-07-02 | 2 | -0/+23 |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | refs.c: SSE2 optimizations for check_refname_componentdt/refs-check-refname-component-sse | David Turner | 2014-06-18 | 2 | -0/+23 |
* | | | | | | | | Merge branch 'ye/http-extract-charset' | Junio C Hamano | 2014-07-02 | 2 | -0/+9 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | http: fix charset detection of extract_content_type()ye/http-extract-charset | Yi EungJun | 2014-06-17 | 2 | -0/+9 |
* | | | | | | | | | Merge branch 'bc/fix-rebase-merge-skip' | Junio C Hamano | 2014-07-02 | 1 | -0/+15 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | rebase--merge: fix --skip with two conflicts in a rowbc/fix-rebase-merge-skip | brian m. carlson | 2014-06-16 | 1 | -0/+15 |
| * | | | | | | | | | Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname' into maint | Junio C Hamano | 2014-05-28 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'mw/symlinks' into maint | Junio C Hamano | 2014-05-28 | 2 | -0/+38 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |