Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | Merge branch 'js/ignore-space-at-eol' into maint | Junio C Hamano | 2016-08-08 | 3 | -3/+13 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | diff: fix a double off-by-one with --ignore-space-at-eoljs/ignore-space-at-eol | Johannes Schindelin | 2016-07-11 | 3 | -4/+6 | |
| * | | | | | | | | | | diff: demonstrate a bug with --patience and --ignore-space-at-eol | Johannes Schindelin | 2016-07-11 | 1 | -0/+8 | |
| | |_|_|_|/ / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'jk/push-scrub-url' into maint | Junio C Hamano | 2016-08-08 | 2 | -2/+14 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | t5541: fix url scrubbing test when GPG is not setjk/push-scrub-url | Jeff King | 2016-07-20 | 1 | -2/+4 | |
| * | | | | | | | | | | push: anonymize URL in status output | Jeff King | 2016-07-14 | 2 | -2/+12 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Merge branch 'nd/cache-tree-ita' into maint | Junio C Hamano | 2016-08-08 | 15 | -53/+87 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | cache-tree: do not generate empty trees as a result of all i-t-a subentriesnd/cache-tree-ita | Nguyễn Thái Ngọc Duy | 2016-07-18 | 2 | -1/+23 | |
| * | | | | | | | | | | cache-tree.c: fix i-t-a entry skipping directory updates sometimes | Nguyễn Thái Ngọc Duy | 2016-07-18 | 2 | -2/+19 | |
| * | | | | | | | | | | test-lib.sh: introduce and use $EMPTY_BLOB | Nguyễn Thái Ngọc Duy | 2016-07-18 | 8 | -38/+35 | |
| * | | | | | | | | | | test-lib.sh: introduce and use $EMPTY_TREE | Nguyễn Thái Ngọc Duy | 2016-07-18 | 6 | -13/+11 | |
| | |_|_|_|/ / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'mh/blame-worktree' into maint | Junio C Hamano | 2016-08-08 | 2 | -18/+71 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | t/t8003-blame-corner-cases.sh: Use here documents | Mike Hommey | 2016-07-18 | 1 | -17/+17 | |
| * | | | | | | | | | | blame: allow to blame paths freshly added to the index | Mike Hommey | 2016-07-18 | 2 | -1/+54 | |
| | |_|/ / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Some fixes for 2.9.3fbsd-lazy-mtime | Junio C Hamano | 2016-07-28 | 2 | -1/+59 | |
* | | | | | | | | | | Merge branch 'ak/lazy-prereq-mktemp' into maint | Junio C Hamano | 2016-07-28 | 1 | -1/+6 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | t7610: test for mktemp before test execution | Armin Kunaschik | 2016-07-06 | 1 | -1/+6 | |
* | | | | | | | | | | | Merge branch 'nd/icase' into maint | Junio C Hamano | 2016-07-28 | 11 | -21/+291 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | grep.c: reuse "icase" variablend/icase | Nguyễn Thái Ngọc Duy | 2016-07-01 | 1 | -4/+1 | |
| * | | | | | | | | | | | diffcore-pickaxe: support case insensitive match on non-ascii | Nguyễn Thái Ngọc Duy | 2016-07-01 | 2 | -0/+18 | |
| * | | | | | | | | | | | diffcore-pickaxe: Add regcomp_or_die() | Nguyễn Thái Ngọc Duy | 2016-07-01 | 1 | -9/+13 | |
| * | | | | | | | | | | | grep/pcre: support utf-8 | Nguyễn Thái Ngọc Duy | 2016-07-01 | 2 | -0/+17 | |
| * | | | | | | | | | | | gettext: add is_utf8_locale() | Nguyễn Thái Ngọc Duy | 2016-07-01 | 2 | -2/+23 | |
| * | | | | | | | | | | | grep/pcre: prepare locale-dependent tables for icase matching | Nguyễn Thái Ngọc Duy | 2016-07-01 | 3 | -2/+26 | |
| * | | | | | | | | | | | grep: rewrite an if/else condition to avoid duplicate expression | Nguyễn Thái Ngọc Duy | 2016-07-01 | 1 | -4/+1 | |
| * | | | | | | | | | | | grep/icase: avoid kwsset when -F is specified | Nguyễn Thái Ngọc Duy | 2016-07-01 | 4 | -1/+108 | |
| * | | | | | | | | | | | grep/icase: avoid kwsset on literal non-ascii strings | Nguyễn Thái Ngọc Duy | 2016-06-27 | 2 | -1/+29 | |
| * | | | | | | | | | | | test-regex: expose full regcomp() to the command line | Nguyễn Thái Ngọc Duy | 2016-06-27 | 1 | -2/+49 | |
| * | | | | | | | | | | | test-regex: isolate the bug test code | Nguyễn Thái Ngọc Duy | 2016-06-27 | 2 | -3/+11 | |
| * | | | | | | | | | | | grep: break down an "if" stmt in preparation for next changes | Nguyễn Thái Ngọc Duy | 2016-06-27 | 1 | -1/+3 | |
* | | | | | | | | | | | | Merge branch 'sb/submodule-parallel-fetch' into maint | Junio C Hamano | 2016-07-28 | 1 | -16/+27 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | hoist out handle_nonblock function for xread and xwritesb/submodule-parallel-fetch | Eric Wong | 2016-07-11 | 1 | -28/+20 | |
| * | | | | | | | | | | | | xwrite: poll on non-blocking FDs | Eric Wong | 2016-06-27 | 1 | -2/+20 | |
| * | | | | | | | | | | | | xread: retry after poll on EAGAIN/EWOULDBLOCK | Eric Wong | 2016-06-27 | 1 | -0/+1 | |
* | | | | | | | | | | | | | Merge branch 'dk/blame-move-no-reason-for-1-line-context' into maint | Junio C Hamano | 2016-07-28 | 1 | -4/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | blame: require 0 context lines while finding moved lines with -Mks/blame-move-no-reason-for-1-line-contextdk/blame-move-no-reason-for-1-line-context | David Kastrup | 2016-05-29 | 1 | -4/+3 | |
* | | | | | | | | | | | | | | Merge branch 'jk/test-match-signal' into maint | Junio C Hamano | 2016-07-28 | 3 | -11/+26 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | t/lib-git-daemon: use test_match_signaljk/test-match-signal | Jeff King | 2016-07-06 | 1 | -2/+1 | |
| * | | | | | | | | | | | | | | test_must_fail: use test_match_signal | Jeff King | 2016-07-06 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | t0005: use test_match_signal as appropriate | Jeff King | 2016-07-06 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | tests: factor portable signal check out of t0005 | Jeff King | 2016-07-06 | 2 | -6/+22 | |
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'js/am-call-theirs-theirs-in-fallback-3way' into maint | Junio C Hamano | 2016-07-28 | 1 | -8/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | am: counteract gender biasjs/am-call-theirs-theirs-in-fallback-3way | Johannes Schindelin | 2016-07-08 | 1 | -8/+8 | |
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'js/t3404-grammo-fix' into maint | Junio C Hamano | 2016-07-28 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | t3404: fix a grammo (commands are ran -> commands are run)js/t3404-grammo-fix | Johannes Schindelin | 2016-06-29 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | Merge branch 'nd/doc-new-command' into maint | Junio C Hamano | 2016-07-28 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | new-command.txt: correct the command description filend/doc-new-command | Nguyễn Thái Ngọc Duy | 2016-06-27 | 1 | -1/+1 | |
| | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'ew/gc-auto-pack-limit-fix' into maint | Junio C Hamano | 2016-07-28 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | gc: fix off-by-one error with gc.autoPackLimitew/gc-auto-pack-limit-fix | Eric Wong | 2016-06-27 | 1 | -1/+1 | |
| | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'js/color-on-windows-comment' into maint | Junio C Hamano | 2016-07-28 | 1 | -5/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |