Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| * | | i18n: rebase-interactive: mark comments of squash for translation | Vasco Almeida | 2016-06-17 | 1 | -0/+1 |
| * | | i18n: rebase-interactive: mark here-doc strings for translation | Vasco Almeida | 2016-06-17 | 1 | -7/+7 |
| * | | t6030: update to use test_i18ncmp | Vasco Almeida | 2016-06-17 | 1 | -2/+2 |
| * | | i18n: advice: internationalize message for conflicts | Vasco Almeida | 2016-06-17 | 1 | -1/+1 |
| * | | i18n: advice: mark string about detached head for translation | Vasco Almeida | 2016-06-17 | 1 | -1/+1 |
| * | | Merge branch 'jc/t2300-setup' into HEAD | Junio C Hamano | 2016-06-07 | 1 | -1/+2 |
| |\ \ | |||||
* | \ \ | Merge branch 'mj/log-show-signature-conf' | Junio C Hamano | 2016-07-11 | 2 | -2/+37 |
|\ \ \ \ | |||||
| * | | | | log: add log.showSignature configuration variablemj/log-show-signature-conf | Mehul Jain | 2016-06-24 | 2 | -0/+27 |
| * | | | | log: add "--no-show-signature" command line option | Mehul Jain | 2016-06-24 | 1 | -0/+5 |
| * | | | | t4202: refactor test | Mehul Jain | 2016-06-24 | 1 | -2/+5 |
* | | | | | Merge branch 'js/find-commit-subject-ignore-leading-blanks' | Junio C Hamano | 2016-07-11 | 1 | -0/+17 |
|\ \ \ \ \ | |||||
| * | | | | | commit.c: make find_commit_subject() more robust | Johannes Schindelin | 2016-06-22 | 1 | -0/+17 |
* | | | | | | Merge branch 'jk/perf-any-version' | Junio C Hamano | 2016-07-11 | 3 | -6/+17 |
|\ \ \ \ \ \ | |||||
| * | | | | | | p4211: explicitly disable renames in no-rename testjk/perf-any-version | Jeff King | 2016-06-22 | 1 | -3/+3 |
| * | | | | | | t/perf: fix regression in testing older versions of git | Jeff King | 2016-06-22 | 2 | -3/+14 |
* | | | | | | | Merge branch 'jk/ansi-color' | Junio C Hamano | 2016-07-11 | 1 | -2/+7 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | color: support strike-through attributejk/ansi-color | Jeff King | 2016-06-23 | 1 | -2/+2 |
| * | | | | | | | color: support "italic" attribute | Jeff King | 2016-06-23 | 1 | -2/+3 |
| * | | | | | | | color: allow "no-" for negating attributes | Jeff King | 2016-06-23 | 1 | -0/+4 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'jc/t2300-setup' | Junio C Hamano | 2016-07-06 | 1 | -1/+9 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t2300: "git --exec-path" is not usable in $PATH on Windows as-isjc/t2300-setup | Johannes Schindelin | 2016-06-22 | 1 | -1/+9 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge branch 'cb/t7810-test-label-fix' | Junio C Hamano | 2016-07-06 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t7810: fix duplicated test titlecb/t7810-test-label-fix | Charles Bailey | 2016-06-21 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'sb/t5614-modernize' | Junio C Hamano | 2016-07-06 | 1 | -50/+20 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t5614: don't use subshellssb/t5614-modernize | Stefan Beller | 2016-06-21 | 1 | -50/+20 |
* | | | | | | | | | Merge branch 'js/perf-on-apple' | Junio C Hamano | 2016-07-06 | 1 | -1/+5 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | perf: accommodate for MacOSXjs/perf-on-apple | Johannes Schindelin | 2016-06-21 | 1 | -1/+5 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'ak/t7800-wo-readlink' | Junio C Hamano | 2016-07-06 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | t7800: readlink may not be availableak/t7800-wo-readlink | Armin Kunaschik | 2016-06-21 | 1 | -1/+1 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'jk/tzoffset-fix' | Junio C Hamano | 2016-07-06 | 2 | -17/+69 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | local_tzoffset: detect errors from tm_to_time_t | Jeff King | 2016-06-20 | 1 | -0/+5 |
| * | | | | | | | | | t0006: test various date formats | Jeff King | 2016-06-20 | 1 | -0/+21 |
| * | | | | | | | | | t0006: rename test-date's "show" to "relative" | Jeff King | 2016-06-20 | 1 | -13/+13 |
* | | | | | | | | | | Merge branch 'sb/clone-shallow-passthru' | Junio C Hamano | 2016-07-06 | 1 | -2/+17 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | clone: do not let --depth imply --shallow-submodulessb/clone-shallow-passthru | Junio C Hamano | 2016-06-20 | 1 | -2/+17 |
* | | | | | | | | | | Merge branch 'jk/gpg-interface-cleanup' | Junio C Hamano | 2016-07-06 | 1 | -1/+8 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | gpg-interface: check gpg signature creation statusjk/gpg-interface-cleanup | Michael J Gruber | 2016-06-17 | 1 | -1/+8 |
| | |_|_|/ / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'nd/graph-width-padded' | Junio C Hamano | 2016-07-06 | 1 | -0/+57 |
|\ \ \ \ \ \ \ \ \ \ |