summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Configure Git contribution guidelines for github.comls/githubLars Schneider2017-06-132-0/+26
* Merge branch 'ab/sha1dc-maint' into maintJunio C Hamano2017-06-073-9/+28
|\
| * sha1dc: update from upstreamÆvar Arnfjörð Bjarmason2017-06-072-9/+27
| * sha1dc: ignore indent-with-non-tab whitespace violationsJeff King2017-06-071-0/+1
* | Git 2.13.1v2.13.1Junio C Hamano2017-06-053-511/+46
* | Merge branch 'ah/doc-rev-parse-short-default' into maintJunio C Hamano2017-06-052-6/+7
|\ \
| * | doc: rewrite description for rev-parse --shortah/doc-rev-parse-short-defaultAndreas Heiduk2017-06-012-6/+7
* | | Merge branch 'ah/doc-filter-branch-export-env' into maintJunio C Hamano2017-06-051-4/+1
|\ \ \
| * | | doc: filter-branch does not require re-export of varsah/doc-filter-branch-export-envAndreas Heiduk2017-05-291-4/+1
* | | | Merge branch 'sd/t3200-typofix' into maintJunio C Hamano2017-06-051-1/+1
|\ \ \ \
| * | | | branch test: fix invalid config key accesssd/t3200-typofixSahil Dua2017-05-291-1/+1
| |/ / /
* | | | Merge branch 'sb/t5531-update-desc' into maintJunio C Hamano2017-06-051-2/+2
|\ \ \ \
| * | | | t5531: fix test descriptionsb/t5531-update-descStefan Beller2017-05-231-2/+2
* | | | | Merge branch 'ah/doc-pretty-format-fix' into maintJunio C Hamano2017-06-051-1/+1
|\ \ \ \ \
| * | | | | Documentation: fix formatting typo in pretty-formats.txtah/doc-pretty-format-fixAndreas Heiduk2017-05-231-1/+1
| |/ / / /
* | | | | Merge branch 'ah/doc-interpret-trailers-ifexists' into maintJunio C Hamano2017-06-051-1/+1
|\ \ \ \ \
| * | | | | Documentation: fix reference to ifExists for interpret-trailersah/doc-interpret-trailers-ifexistsAndreas Heiduk2017-05-231-1/+1
| |/ / / /
* | | | | Merge branch 'ab/ref-filter-no-contains' into maintJunio C Hamano2017-06-051-1/+1
|\ \ \ \ \
| * | | | | tag: duplicate mention of --contains should mention --no-containsÆvar Arnfjörð Bjarmason2017-05-231-1/+1
* | | | | | Merge branch 'sg/core-filemode-doc-typofix' into maintJunio C Hamano2017-06-051-1/+1
|\ \ \ \ \ \
| * | | | | | docs/config.txt: fix indefinite article in core.fileMode descriptionsg/core-filemode-doc-typofixSZEDER Gábor2017-05-261-1/+1
* | | | | | | Merge branch 'tb/dedup-crlf-tests' into maintJunio C Hamano2017-06-052-187/+0
|\ \ \ \ \ \ \
| * | | | | | | t0027: tests are not expensive; remove t0025tb/dedup-crlf-testsTorsten Bögershausen2017-05-102-187/+0
* | | | | | | | Merge branch 'jn/credential-doc-on-clear' into maintJunio C Hamano2017-06-051-10/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | credential doc: make multiple-helper behavior more prominentjn/credential-doc-on-clearJonathan Nieder2017-05-021-10/+10
* | | | | | | | | Merge branch 'jk/url-insteadof-config' into maintJunio C Hamano2017-06-052-0/+17
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | docs/config: mention protocol implications of url.insteadOfjk/url-insteadof-configJeff King2017-06-012-0/+17
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/unbreak-am-h' into maintJunio C Hamano2017-06-051-0/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | am: handle "-h" argument earlierjk/unbreak-am-hJeff King2017-05-301-0/+3
| |/ / / / / / / /
* | | | | | | | | Merge branch 'ab/sha1dc-maint' into maintJunio C Hamano2017-06-057-88/+172
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | sha1dc: update from upstreamÆvar Arnfjörð Bjarmason2017-05-227-88/+172
| |/ / / / / / /
* | | | | | | | Merge branch 'js/bs-is-a-dir-sep-on-windows' into maintJunio C Hamano2017-06-052-2/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | Windows: do not treat a path with backslashes as a remote's nick namejs/bs-is-a-dir-sep-on-windowsJohannes Sixt2017-05-261-1/+6
| * | | | | | | | mingw.h: permit arguments with side effects for is_dir_sepJohannes Sixt2017-05-231-1/+5
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'jk/alternate-ref-optim' into maintJunio C Hamano2017-06-051-1/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | t5400: avoid concurrent writes into a trace filejk/alternate-ref-optimJeff King2017-05-181-1/+4
* | | | | | | | | Merge branch 'bm/interpret-trailers-cut-line-is-eom' into maintJunio C Hamano2017-06-055-13/+32
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | interpret-trailers: honor the cut linebm/interpret-trailers-cut-line-is-eomBrian Malehorn2017-05-185-13/+32
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'kn/ref-filter-branch-list' into maintJunio C Hamano2017-06-051-7/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ref-filter: resolve HEAD when parsing %(HEAD) atomJeff King2017-05-201-7/+9
* | | | | | | | | | Merge branch 'rs/checkout-am-fix-unborn' into maintJunio C Hamano2017-06-052-2/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | am: check return value of resolve_refdup before using hashrs/checkout-am-fix-unbornRené Scharfe2017-05-081-1/+1
| * | | | | | | | | | checkout: check return value of resolve_refdup before using hashRené Scharfe2017-05-081-1/+2
* | | | | | | | | | | Merge branch 'jn/clone-add-empty-config-from-command-line' into maintJunio C Hamano2017-06-052-1/+11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | clone: handle empty config values in -cjn/clone-add-empty-config-from-command-lineJonathan Nieder2017-05-022-1/+11
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'ab/c-translators-comment-style' into maintJunio C Hamano2017-06-059-26/+46
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | C style: use standard style for "TRANSLATORS" commentsab/c-translators-comment-styleÆvar Arnfjörð Bjarmason2017-05-319-26/+46
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'ls/travis-doc-asciidoctor' into maintJunio C Hamano2017-06-052-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