summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* mingw: simplify PATH handlingrs/mingw-path-lookup-simplifyRené Scharfe2017-05-231-68/+23
* Start post 2.13 cycleJunio C Hamano2017-05-163-2/+99
* Merge branch 'js/larger-timestamps'Junio C Hamano2017-05-1655-220/+257
|\
| * archive-tar: fix a sparse 'constant too large' warningRamsay Jones2017-05-091-2/+2
| * use uintmax_t for timestampsJohannes Schindelin2017-04-271-4/+4
| * date.c: abort if the system time cannot handle one of our timestampsJohannes Schindelin2017-04-271-2/+15
| * timestamp_t: a new data type for timestampsJohannes Schindelin2017-04-2749-158/+170
| * PRItime: introduce a new "printf format" for timestampsJohannes Schindelin2017-04-2315-30/+31
| * parse_timestamp(): specify explicitly where we parse timestampsJohannes Schindelin2017-04-2313-18/+20
| * t0006 & t5000: skip "far in the future" test when time_t is too limitedJohannes Schindelin2017-04-204-4/+8
| * t0006 & t5000: prepare for 64-bit timestampsJohannes Schindelin2017-04-204-6/+11
| * ref-filter: avoid using `unsigned long` for catch-all data typeJohannes Schindelin2017-04-201-8/+8
* | Merge branch 'jc/apply-fix-mismerge'Junio C Hamano2017-05-161-169/+169
|\ \
| * | apply.c: fix whitespace-only mismergejc/apply-fix-mismergeJunio C Hamano2017-05-081-169/+169
* | | Merge branch 'ab/aix-needs-compat-regex'Junio C Hamano2017-05-161-0/+1
|\ \ \
| * | | config.mak.uname: set NO_REGEX=NeedsStartEnd on AIXab/aix-needs-compat-regexÆvar Arnfjörð Bjarmason2017-05-041-0/+1
| |/ /
* | | Merge branch 'jn/credential-doc-on-clear'Junio C Hamano2017-05-161-10/+10
|\ \ \
| * | | credential doc: make multiple-helper behavior more prominentjn/credential-doc-on-clearJonathan Nieder2017-05-021-10/+10
* | | | Merge branch 'jn/clone-add-empty-config-from-command-line'Junio C Hamano2017-05-162-1/+11
|\ \ \ \
| * | | | clone: handle empty config values in -cjn/clone-add-empty-config-from-command-lineJonathan Nieder2017-05-022-1/+11
| |/ / /
* | | | Merge branch 'bw/submodule-has-commits-update'Junio C Hamano2017-05-161-156/+149
|\ \ \ \
| * | | | submodule: refactor logic to determine changed submodulesbw/submodule-has-commits-updateBrandon Williams2017-05-021-142/+105
| * | | | submodule: improve submodule_has_commits()Brandon Williams2017-05-021-0/+34
| * | | | submodule: change string_list changed_submodule_pathsBrandon Williams2017-05-011-2/+2
| * | | | submodule: remove add_oid_to_argv()Brandon Williams2017-05-011-8/+2
| * | | | submodule: rename free_submodules_sha1s()Brandon Williams2017-05-011-2/+3
| * | | | submodule: rename add_sha1_to_array()Brandon Williams2017-05-011-4/+5
* | | | | Merge branch 'ls/travis-doc-asciidoctor'Junio C Hamano2017-05-162-4/+16
|\ \ \ \ \
| * | | | | travis-ci: check AsciiDoc/AsciiDoctor stderr outputls/travis-doc-asciidoctorLars Schneider2017-04-261-3/+6
| * | | | | travis-ci: unset compiler for jobs that do not need oneLars Schneider2017-04-161-1/+2
| * | | | | travis-ci: parallelize documentation buildLars Schneider2017-04-161-2/+2
| * | | | | travis-ci: build documentation with AsciiDoc and AsciidoctorLars Schneider2017-04-162-2/+10
| | |_|/ / | |/| | |
* | | | | Merge branch 'rs/large-zip'Junio C Hamano2017-05-163-84/+181
|\ \ \ \ \
| * | | | | t5004: require 64-bit support for big ZIP testsrs/large-zipRené Scharfe2017-05-011-2/+7
| * | | | | archive-zip: set version field for big files correctlyRené Scharfe2017-04-281-2/+6
| * | | | | archive-zip: support files bigger than 4GBRené Scharfe2017-04-242-16/+76
| * | | | | archive-zip: support archives bigger than 4GBRené Scharfe2017-04-242-5/+29
| * | | | | archive-zip: write ZIP dir entry directly to strbufRené Scharfe2017-04-241-54/+27
| * | | | | archive-zip: use strbuf for ZIP directoryRené Scharfe2017-04-241-25/+11
| * | | | | archive-zip: add tests for big ZIP archivesRené Scharfe2017-04-242-0/+45
| |/ / / /
* | | | | Merge branch 'ab/clone-no-tags'Junio C Hamano2017-05-165-14/+117
|\ \ \ \ \
| * | | | | tests: rename a test having to do with shallow submodulesab/clone-no-tagsÆvar Arnfjörð Bjarmason2017-05-011-0/+0
| * | | | | clone: add a --no-tags option to clone without tagsÆvar Arnfjörð Bjarmason2017-05-014-5/+99
| * | | | | tests: change "cd ... && git fetch" to "cd &&\n\tgit fetch"Ævar Arnfjörð Bjarmason2017-05-011-9/+18
* | | | | | Merge branch 'sk/status-short-branch-color-config'Junio C Hamano2017-05-165-7/+125
|\ \ \ \ \ \
| * | | | | | status: add color config slots for branch info in "--short --branch"sk/status-short-branch-color-configStephen Kent2017-04-284-3/+14
| * | | | | | status: fix missing newline when comment chars are disabledJeff King2017-04-282-5/+112
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'jk/am-leakfix'Junio C Hamano2017-05-161-20/+14
|\ \ \ \ \ \
| * | | | | | am: shorten ident_split variable name in get_commit_info()jk/am-leakfixJeff King2017-04-271-11/+9
| * | | | | | am: simplify allocations in get_commit_info()Jeff King2017-04-271-15/+10