Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'rs/xdiff-hunk-with-func-line' into maint | Junio C Hamano | 2016-06-27 | 7 | -77/+278 |
|\ | |||||
| * | xdiff: fix merging of appended hunk with -Wrs/xdiff-hunk-with-func-line | René Scharfe | 2016-06-09 | 1 | -1/+23 |
| * | grep: -W: don't extend context to trailing empty lines | René Scharfe | 2016-05-31 | 1 | -1/+1 |
| * | t7810: add test for grep -W and trailing empty context lines | René Scharfe | 2016-05-31 | 1 | -3/+16 |
| * | xdiff: don't trim common tail with -W | René Scharfe | 2016-05-31 | 1 | -1/+1 |
| * | xdiff: -W: don't include common trailing empty lines in context | René Scharfe | 2016-05-31 | 1 | -2/+2 |
| * | xdiff: ignore empty lines before added functions with -W | René Scharfe | 2016-05-31 | 1 | -1/+1 |
| * | xdiff: handle appended chunks better with -W | René Scharfe | 2016-05-31 | 1 | -1/+1 |
| * | t4051: rewrite, add more tests | René Scharfe | 2016-05-31 | 6 | -74/+240 |
* | | Merge branch 'jk/rev-list-count-with-bitmap' into maint | Junio C Hamano | 2016-06-27 | 1 | -0/+6 |
|\ \ | |||||
| * | | rev-list: "adjust" results of "--count --use-bitmap-index -n" | Jeff King | 2016-06-03 | 1 | -0/+6 |
* | | | Merge branch 'et/pretty-format-c-auto' into maint | Junio C Hamano | 2016-06-27 | 1 | -7/+19 |
|\ \ \ | |||||
| * | | | format_commit_message: honor `color=auto` for `%C(auto)`et/pretty-format-c-auto | Edward Thomson | 2016-05-27 | 1 | -7/+19 |
* | | | | Merge branch 'jk/shell-portability' | Junio C Hamano | 2016-06-10 | 4 | -4/+25 |
|\ \ \ \ | |||||
| * | | | | t5500 & t7403: lose bash-ism "local"jk/shell-portability | Junio C Hamano | 2016-06-01 | 2 | -3/+2 |
| * | | | | test-lib: add in-shell "env" replacement | Jeff King | 2016-06-01 | 2 | -1/+23 |
* | | | | | Merge branch 'jc/t2300-setup' | Junio C Hamano | 2016-06-10 | 1 | -1/+2 |
|\ \ \ \ \ | |||||
| * | | | | | t2300: run git-sh-setup in an environment that better mimics the real life | Junio C Hamano | 2016-06-01 | 1 | -1/+2 |
| |/ / / / | |||||
| * | | | | Merge branch 'sb/submodule-deinit-all' into maint | Junio C Hamano | 2016-05-31 | 1 | -1/+23 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'jk/test-send-sh-x-trace-elsewhere' into maint | Junio C Hamano | 2016-05-31 | 2 | -3/+16 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'js/name-rev-use-oldest-ref' into maint | Junio C Hamano | 2016-05-31 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'jc/fsck-nul-in-commit' into maint | Junio C Hamano | 2016-05-26 | 1 | -0/+18 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'js/windows-dotgit' into maint | Junio C Hamano | 2016-05-26 | 2 | -0/+50 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'lp/typofixes' into maint | Junio C Hamano | 2016-05-26 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'sb/z-is-gnutar-ism' into maint | Junio C Hamano | 2016-05-26 | 2 | -4/+4 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'va/i18n-misc-updates' into maint | Junio C Hamano | 2016-05-26 | 1 | -9/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ak/t4151-ls-files-could-be-empty' into maint | Junio C Hamano | 2016-05-26 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/test-seq' into maint | Junio C Hamano | 2016-05-26 | 1 | -15/+13 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tb/t5601-sed-fix' into maint | Junio C Hamano | 2016-05-26 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge branch 'sb/clean-test-fix' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sg/test-lib-simplify-expr-away' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -5/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/close-packs-before-gc' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ls/p4-lfs' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ls/p4-lfs-test-fix-2.7.0' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nf/mergetool-prompt' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/push-client-deadlock-fix' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -6/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sb/mv-submodule-fix' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -0/+16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ld/p4-test-py3' into HEAD | Junio C Hamano | 2016-05-18 | 2 | -6/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/perf-rebase-i' | Junio C Hamano | 2016-06-03 | 1 | -1/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | perf: make the tests work without a worktreejs/perf-rebase-i | René Scharfe | 2016-05-31 | 1 | -1/+4 |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'es/t1500-modernize' | Junio C Hamano | 2016-05-31 | 1 | -60/+63 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | t1500: avoid setting environment variables outside of testses/t1500-modernize | Eric Sunshine | 2016-05-18 | 1 | -9/+15 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | t1500: avoid setting configuration options outside of tests | Eric Sunshine | 2016-05-18 | 1 | -19/+20 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | t1500: avoid changing working directory outside of tests | Eric Sunshine | 2016-05-18 | 1 | -19/+23 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | t1500: test_rev_parse: facilitate future test enhancements | Eric Sunshine | 2016-05-18 | 1 | -27/+17 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | t1500: be considerate to future potential tests | Eric Sunshine | 2016-05-17 | 1 | -3/+5 |
| | |/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'fc/fast-import-broken-marks-file' | Junio C Hamano | 2016-05-31 | 1 | -0/+15 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | fast-import: do not truncate exported marks filefc/fast-import-broken-marks-file | Felipe Contreras | 2016-05-17 | 1 | -0/+15 |
| |/ / / / / / / / / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ak/t0008-ksh88-workaround' | Junio C Hamano | 2016-05-29 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | t0008: 4 tests fail with ksh88ak/t0008-ksh88-workaround | Armin Kunaschik | 2016-05-20 | 1 | -2/+2 |