Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'js/log-to-diffopt-file' | Junio C Hamano | 2016-07-19 | 2 | -0/+13 |
|\ | |||||
| * | mingw: fix the shortlog --output=<file> testjs/log-to-diffopt-file | Johannes Schindelin | 2016-07-11 | 1 | -2/+2 |
| * | t4211: ensure that log respects --output=<file> | Johannes Schindelin | 2016-06-24 | 1 | -0/+7 |
| * | shortlog: respect the --output=<file> setting | Johannes Schindelin | 2016-06-24 | 1 | -0/+6 |
* | | archive-tar: huge offset and future timestamps would not work on 32-bit | Junio C Hamano | 2016-07-15 | 1 | -6/+6 |
* | | Sync with 2.9.2 | Junio C Hamano | 2016-07-15 | 2 | -3/+12 |
|\ \ | |||||
| * \ | Merge branch 'jk/tzoffset-fix' into maint | Junio C Hamano | 2016-07-15 | 2 | -3/+12 |
| |\ \ | |||||
| | * | | t0006: skip "far in the future" test when unsigned long is not long enoughjk/tzoffset-fix | Jeff King | 2016-07-15 | 2 | -3/+12 |
| * | | | Merge branch 'jc/t2300-setup' into maint | Junio C Hamano | 2016-07-11 | 1 | -1/+9 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'cb/t7810-test-label-fix' into maint | Junio C Hamano | 2016-07-11 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'sb/t5614-modernize' into maint | Junio C Hamano | 2016-07-11 | 1 | -50/+20 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'js/perf-on-apple' into maint | Junio C Hamano | 2016-07-11 | 1 | -1/+5 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'ak/t7800-wo-readlink' into maint | Junio C Hamano | 2016-07-11 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'jk/tzoffset-fix' into maint | Junio C Hamano | 2016-07-11 | 2 | -17/+69 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | |||||
| * | | | | | | | | Merge branch 'sb/clone-shallow-passthru' into maint | Junio C Hamano | 2016-07-11 | 1 | -2/+17 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'nd/graph-width-padded' into maint | Junio C Hamano | 2016-07-11 | 1 | -0/+57 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'et/add-chmod-x' into maint | Junio C Hamano | 2016-07-06 | 1 | -0/+30 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'sg/reflog-past-root' into maint | Junio C Hamano | 2016-07-06 | 2 | -1/+23 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/xdiff-hunk-with-func-line' into maint | Junio C Hamano | 2016-06-27 | 7 | -77/+278 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/rev-list-count-with-bitmap' into maint | Junio C Hamano | 2016-06-27 | 1 | -0/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'et/pretty-format-c-auto' into maint | Junio C Hamano | 2016-06-27 | 1 | -7/+19 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/upload-pack-hook' | Junio C Hamano | 2016-07-14 | 1 | -1/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | mingw: fix regression in t1308-config-setjk/upload-pack-hook | Johannes Schindelin | 2016-07-14 | 1 | -1/+9 |
* | | | | | | | | | | | | | | | | | Merge branch 'jk/big-and-future-archive-tar' | Junio C Hamano | 2016-07-13 | 5 | -20/+91 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | archive-tar: write extended headers for far-future mtime | Jeff King | 2016-07-01 | 1 | -2/+2 |
| * | | | | | | | | | | | | | | | | | archive-tar: write extended headers for file sizes >= 8GB | Jeff King | 2016-07-01 | 1 | -2/+2 |
| * | | | | | | | | | | | | | | | | | t5000: test tar files that overflow ustar headers | Jeff King | 2016-07-01 | 3 | -0/+74 |
| * | | | | | | | | | | | | | | | | | t9300: factor out portable "head -c" replacement | Jeff King | 2016-07-01 | 2 | -20/+17 |
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Merge branch 'nd/ita-cleanup' | Junio C Hamano | 2016-07-13 | 1 | -1/+59 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | grep: fix grepping for "intent to add" filesnd/ita-cleanup | Charles Bailey | 2016-07-01 | 1 | -0/+58 |
| * | | | | | | | | | | | | | | | | | t7810-grep.sh: fix a whitespace inconsistency | Charles Bailey | 2016-07-01 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | t7810-grep.sh: fix duplicated test name | Charles Bailey | 2016-07-01 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | Merge branch 'ps/rebase-i-auto-unstash-upon-abort' | Junio C Hamano | 2016-07-13 | 1 | -0/+31 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | rebase -i: restore autostash on abortps/rebase-i-auto-unstash-upon-abort | Patrick Steinhardt | 2016-06-29 | 1 | -0/+31 |
* | | | | | | | | | | | | | | | | | | | Merge branch 'js/t3404-grammo-fix' | Junio C Hamano | 2016-07-13 | 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 'dg/subtree-rebase-test' | Junio C Hamano | 2016-07-13 | 1 | -0/+119 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | contrib/subtree: Add a test for subtree rebase that loses commitsdg/subtree-rebase-test | David A. Greene | 2016-06-28 | 1 | -0/+119 |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'ah/unpack-trees-advice-messages' | Junio C Hamano | 2016-07-13 | 3 | -7/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | unpack-trees: fix English grammar in do-this-before-that messagesah/unpack-trees-advice-messages | Alex Henrie | 2016-06-27 | 3 | -7/+7 |
| | |_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'va/i18n-even-more' | Junio C Hamano | 2016-07-13 | 35 | -93/+91 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | t5541: become resilient to GETTEXT_POISON | Vasco Almeida | 2016-07-01 | 1 | -6/+6 |
| * | | | | | | | | | | | | | | | | | | | | | i18n: notes: mark strings for translation | Vasco Almeida | 2016-06-17 | 2 | -5/+5 |
| * | | | | | | | | | | | | | | | | | | | | | i18n: bisect: mark strings for translation | Vasco Almeida | 2016-06-17 | 1 | -11/+11 |
| * | | | | | | | | | | | | | | | | | | | | | t5523: use test_i18ngrep for negation | Vasco Almeida | 2016-06-17 | 1 | -4/+4 |
| * | | | | | | | | | | | | | | | | | | | | | t4153: fix negated test_i18ngrep call | Vasco Almeida | 2016-06-17 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | | | | | t9003: become resilient to GETTEXT_POISON | Vasco Almeida | 2016-06-17 | 1 | -2/+2 |
| * | | | | | | | | | | | | | | | | | | | | | tests: unpack-trees: update to use test_i18n* functions | Vasco Almeida | 2016-06-17 | 4 | -6/+6 |
| * | | | | | | | | | | | | | | | | | | | | | tests: use test_i18n* functions to suppress false positives | Vasco Almeida | 2016-06-17 | 21 | -44/+41 |
| * | | | | | | | | | | | | | | | | | | | | | i18n: setup: mark strings for translation | Vasco Almeida | 2016-06-17 | 2 | -3/+3 |