summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* t4205: indent here documentsjk/t4205-cleanupJeff King2016-07-271-196/+196
* t4205: drop top-level &&-chainingJeff King2016-07-271-2/+4
* Git 2.9.2v2.9.2Junio C Hamano2016-07-154-3/+17
* Merge branch 'jk/tzoffset-fix' into maintJunio C Hamano2016-07-153-3/+18
|\
| * t0006: skip "far in the future" test when unsigned long is not long enoughjk/tzoffset-fixJeff King2016-07-153-3/+18
* | Git 2.9.1v2.9.1Junio C Hamano2016-07-113-2/+58
* | Merge branch 'jc/t2300-setup' into maintJunio C Hamano2016-07-111-1/+9
|\ \
| * | t2300: "git --exec-path" is not usable in $PATH on Windows as-isjc/t2300-setupJohannes Schindelin2016-06-221-1/+9
* | | Merge branch 'cb/t7810-test-label-fix' into maintJunio C Hamano2016-07-111-1/+1
|\ \ \
| * | | t7810: fix duplicated test titlecb/t7810-test-label-fixCharles Bailey2016-06-211-1/+1
* | | | Merge branch 'sb/t5614-modernize' into maintJunio C Hamano2016-07-111-50/+20
|\ \ \ \
| * | | | t5614: don't use subshellssb/t5614-modernizeStefan Beller2016-06-211-50/+20
* | | | | Merge branch 'jn/preformatted-doc-url' into maintJunio C Hamano2016-07-111-2/+2
|\ \ \ \ \
| * | | | | doc: git-htmldocs.googlecode.com is no morejn/preformatted-doc-urlJonathan Nieder2016-06-221-2/+2
* | | | | | Merge branch 'ao/p4-has-branch-prefix-fix' into maintJunio C Hamano2016-07-111-1/+1
|\ \ \ \ \ \
| * | | | | | git-p4: correct hasBranchPrefix verbose outputao/p4-has-branch-prefix-fixAndrew Oakley2016-06-221-1/+1
* | | | | | | Merge branch 'js/perf-on-apple' into maintJunio C Hamano2016-07-112-1/+7
|\ \ \ \ \ \ \
| * | | | | | | perf: accommodate for MacOSXjs/perf-on-appleJohannes Schindelin2016-06-212-1/+7
* | | | | | | | Merge branch 'ak/t7800-wo-readlink' into maintJunio C Hamano2016-07-111-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | t7800: readlink may not be availableak/t7800-wo-readlinkArmin Kunaschik2016-06-211-1/+1
* | | | | | | | | Merge branch 'jk/tzoffset-fix' into maintJunio C Hamano2016-07-113-17/+71
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | local_tzoffset: detect errors from tm_to_time_tJeff King2016-06-202-0/+7
| * | | | | | | | t0006: test various date formatsJeff King2016-06-202-0/+47
| * | | | | | | | t0006: rename test-date's "show" to "relative"Jeff King2016-06-202-17/+17
* | | | | | | | | Merge branch 'js/mingw-parameter-less-c-functions' into maintJunio C Hamano2016-07-113-6/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | mingw: let the build succeed with DEVELOPER=1js/mingw-parameter-less-c-functionsJohannes Schindelin2016-06-203-6/+6
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'lc/shell-default-value-noexpand' into maintJunio C Hamano2016-07-111-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | sh-setup: enclose setting of ${VAR=default} in double-quoteslc/shell-default-value-noexpandLE Manh Cuong2016-06-191-3/+3
* | | | | | | | | | Merge branch 'sb/clone-shallow-passthru' into maintJunio C Hamano2016-07-113-8/+21
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | clone: do not let --depth imply --shallow-submodulessb/clone-shallow-passthruJunio C Hamano2016-06-203-8/+21
* | | | | | | | | | Merge branch 'mg/signature-doc' into maintJunio C Hamano2016-07-112-0/+187
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Documentation/technical: signed merge tag formatmg/signature-docMichael J Gruber2016-06-171-0/+74
| * | | | | | | | | | Documentation/technical: signed commit formatMichael J Gruber2016-06-171-0/+48
| * | | | | | | | | | Documentation/technical: signed tag formatMichael J Gruber2016-06-171-0/+47
| * | | | | | | | | | Documentation/technical: describe signature formatsMichael J Gruber2016-06-172-0/+18
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jk/bisect-show-tree' into maintJunio C Hamano2016-07-111-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | bisect: always call setup_revisions after init_revisionsjk/bisect-show-treeJeff King2016-06-161-0/+1
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'km/fetch-do-not-free-remote-name' into maintJunio C Hamano2016-07-111-4/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | builtin/fetch.c: don't free remote->name after fetchkm/fetch-do-not-free-remote-nameKeith McGuigan2016-06-141-4/+2
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'nd/graph-width-padded' into maintJunio C Hamano2016-07-116-1/+80
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | pretty.c: support <direction>|(<negative number>) formsnd/graph-width-paddedNguyễn Thái Ngọc Duy2016-06-162-1/+40
| * | | | | | | | | | pretty: pass graph width to pretty formatting for use in '%>|(N)'Josef Kufner2016-06-166-0/+40
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jk/add-i-diff-compact-heuristics' into maintJunio C Hamano2016-07-111-0/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | add--interactive: respect diff.compactionHeuristicjk/add-i-diff-compact-heuristicsJeff King2016-06-161-0/+4
* | | | | | | | | | | More fixes for 2.9.1Junio C Hamano2016-07-061-0/+34
* | | | | | | | | | | Merge branch 'jc/deref-tag' into maintJunio C Hamano2016-07-062-6/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | blame, line-log: do not loop around deref_tag()jc/deref-tagJunio C Hamano2016-06-142-6/+3
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'pb/strbuf-read-file-doc' into maintJunio C Hamano2016-07-061-0/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | strbuf: describe the return value of strbuf_read_filepb/strbuf-read-file-docPranit Bauva2016-06-141-0/+2
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'jk/fetch-prune-doc' into maintJunio C Hamano2016-07-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \