summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* pager: move pager-specific setup into the buildew/build-time-pager-tweaksEric Wong2016-08-045-8/+67
* Some fixes for 2.9.3fbsd-lazy-mtimeJunio C Hamano2016-07-282-1/+59
* Merge branch 'ak/lazy-prereq-mktemp' into maintJunio C Hamano2016-07-281-1/+6
|\
| * t7610: test for mktemp before test executionArmin Kunaschik2016-07-061-1/+6
* | Merge branch 'nd/icase' into maintJunio C Hamano2016-07-2811-21/+291
|\ \
| * | grep.c: reuse "icase" variablend/icaseNguyễn Thái Ngọc Duy2016-07-011-4/+1
| * | diffcore-pickaxe: support case insensitive match on non-asciiNguyễn Thái Ngọc Duy2016-07-012-0/+18
| * | diffcore-pickaxe: Add regcomp_or_die()Nguyễn Thái Ngọc Duy2016-07-011-9/+13
| * | grep/pcre: support utf-8Nguyễn Thái Ngọc Duy2016-07-012-0/+17
| * | gettext: add is_utf8_locale()Nguyễn Thái Ngọc Duy2016-07-012-2/+23
| * | grep/pcre: prepare locale-dependent tables for icase matchingNguyễn Thái Ngọc Duy2016-07-013-2/+26
| * | grep: rewrite an if/else condition to avoid duplicate expressionNguyễn Thái Ngọc Duy2016-07-011-4/+1
| * | grep/icase: avoid kwsset when -F is specifiedNguyễn Thái Ngọc Duy2016-07-014-1/+108
| * | grep/icase: avoid kwsset on literal non-ascii stringsNguyễn Thái Ngọc Duy2016-06-272-1/+29
| * | test-regex: expose full regcomp() to the command lineNguyễn Thái Ngọc Duy2016-06-271-2/+49
| * | test-regex: isolate the bug test codeNguyễn Thái Ngọc Duy2016-06-272-3/+11
| * | grep: break down an "if" stmt in preparation for next changesNguyễn Thái Ngọc Duy2016-06-271-1/+3
* | | Merge branch 'sb/submodule-parallel-fetch' into maintJunio C Hamano2016-07-281-16/+27
|\ \ \
| * | | hoist out handle_nonblock function for xread and xwritesb/submodule-parallel-fetchEric Wong2016-07-111-28/+20
| * | | xwrite: poll on non-blocking FDsEric Wong2016-06-271-2/+20
| * | | xread: retry after poll on EAGAIN/EWOULDBLOCKEric Wong2016-06-271-0/+1
* | | | Merge branch 'dk/blame-move-no-reason-for-1-line-context' into maintJunio C Hamano2016-07-281-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-contextDavid Kastrup2016-05-291-4/+3
* | | | | Merge branch 'jk/test-match-signal' into maintJunio C Hamano2016-07-283-11/+26
|\ \ \ \ \
| * | | | | t/lib-git-daemon: use test_match_signaljk/test-match-signalJeff King2016-07-061-2/+1
| * | | | | test_must_fail: use test_match_signalJeff King2016-07-061-1/+1
| * | | | | t0005: use test_match_signal as appropriateJeff King2016-07-061-2/+2
| * | | | | tests: factor portable signal check out of t0005Jeff King2016-07-062-6/+22
* | | | | | Merge branch 'js/am-call-theirs-theirs-in-fallback-3way' into maintJunio C Hamano2016-07-281-8/+8
|\ \ \ \ \ \
| * | | | | | am: counteract gender biasjs/am-call-theirs-theirs-in-fallback-3wayJohannes Schindelin2016-07-081-8/+8
* | | | | | | Merge branch 'js/t3404-grammo-fix' into maintJunio C Hamano2016-07-281-1/+1
|\ \ \ \ \ \ \
| * | | | | | | t3404: fix a grammo (commands are ran -> commands are run)js/t3404-grammo-fixJohannes Schindelin2016-06-291-1/+1
* | | | | | | | Merge branch 'nd/doc-new-command' into maintJunio C Hamano2016-07-281-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | new-command.txt: correct the command description filend/doc-new-commandNguyễn Thái Ngọc Duy2016-06-271-1/+1
* | | | | | | | | Merge branch 'ew/gc-auto-pack-limit-fix' into maintJunio C Hamano2016-07-281-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | gc: fix off-by-one error with gc.autoPackLimitew/gc-auto-pack-limit-fixEric Wong2016-06-271-1/+1
* | | | | | | | | | Merge branch 'js/color-on-windows-comment' into maintJunio C Hamano2016-07-281-5/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | color.h: remove obsolete comment about limitations on Windowsjs/color-on-windows-commentJohannes Schindelin2016-06-281-5/+0
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'mm/doc-tt' into maintJunio C Hamano2016-07-2862-227/+228
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | doc: typeset HEAD and variants as literalmm/doc-ttMatthieu Moy2016-06-2811-26/+26
| * | | | | | | | | | CodingGuidelines: formatting HEAD in documentationMatthieu Moy2016-06-281-2/+3
| * | | | | | | | | | doc: typeset long options with argument as literalMatthieu Moy2016-06-281-2/+2
| * | | | | | | | | | doc: typeset '--' as literalMatthieu Moy2016-06-283-4/+4
| * | | | | | | | | | doc: typeset long command-line options as literalMatthieu Moy2016-06-2846-149/+149
| * | | | | | | | | | doc: typeset short command-line options as literalMatthieu Moy2016-06-2823-52/+52
| * | | | | | | | | | Documentation/git-mv.txt: fix whitespace indentationMatthieu Moy2016-06-281-2/+2
* | | | | | | | | | | Merge branch 'js/sign-empty-commit-fix' into maintJunio C Hamano2016-07-281-1/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | commit -S: avoid invalid pointer with empty messagejs/sign-empty-commit-fixJohannes Schindelin2016-06-291-1/+6
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'ps/rebase-i-auto-unstash-upon-abort' into maintJunio C Hamano2016-07-282-0/+32
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | rebase -i: restore autostash on abortps/rebase-i-auto-unstash-upon-abortPatrick Steinhardt2016-06-292-0/+32
| |/ / / / / / / / / /