summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* am: reset cached ident date for each patchjk/reset-ident-time-per-commitJeff King2016-08-013-0/+8
* Git 2.8.4v2.8.4Junio C Hamano2016-06-064-3/+18
* Merge branch 'kb/msys2-tty' into maintJunio C Hamano2016-06-062-5/+56
|\
| * mingw: make isatty() recognize MSYS2's pseudo terminals (/dev/pty*)kb/msys2-ttyKarsten Blees2016-05-262-5/+56
* | Merge branch 'da/difftool' into maintJunio C Hamano2016-06-062-2/+30
|\ \
| * | difftool: handle unmerged files in dir-diff modeda/difftoolDavid Aguilar2016-05-162-0/+28
| * | difftool: initialize variables for readabilityDavid Aguilar2016-05-161-2/+2
* | | Merge branch 'tb/core-eol-fix' into maintJunio C Hamano2016-06-064-189/+141
|\ \ \
| * | | convert.c: ident + core.autocrlf didn't worktb/core-eol-fixTorsten Bögershausen2016-04-252-13/+8
| * | | t0027: test cases for combined attributesTorsten Bögershausen2016-04-251-169/+129
| * | | convert: allow core.autocrlf=input and core.eol=crlfTorsten Bögershausen2016-04-252-7/+3
| * | | t0027: make commit_chk_wrnNNO() reliableTorsten Bögershausen2016-04-251-1/+2
* | | | Merge branch 'ar/diff-args-osx-precompose' into maintJunio C Hamano2016-06-065-0/+47
|\ \ \ \
| * | | | diff: run arguments through precompose_argvar/diff-args-osx-precomposeAlexander Rinass2016-05-135-0/+47
* | | | | More topics for 2.8.4Junio C Hamano2016-05-311-0/+28
* | | | | Merge branch 'sb/submodule-deinit-all' into maintJunio C Hamano2016-05-313-10/+48
|\ \ \ \ \
| * | | | | submodule deinit: require '--all' instead of '.' for all submodulesStefan Beller2016-05-053-10/+48
| | |/ / / | |/| | |
* | | | | Merge branch 'bn/http-cookiefile-config' into maintJunio C Hamano2016-05-312-3/+4
|\ \ \ \ \
| * | | | | http: expand http.cookieFile as a pathbn/http-cookiefile-configBrian Norris2016-05-042-2/+3
| * | | | | Documentation: config: improve word ordering for http.cookieFileBrian Norris2016-05-041-1/+1
* | | | | | Merge branch 'jk/test-send-sh-x-trace-elsewhere' into maintJunio C Hamano2016-05-312-3/+16
|\ \ \ \ \ \
| * | | | | | test-lib: set BASH_XTRACEFD automaticallyjk/test-send-sh-x-trace-elsewhereJeff King2016-05-112-3/+16
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'js/name-rev-use-oldest-ref' into maintJunio C Hamano2016-05-312-7/+14
|\ \ \ \ \ \
| * | | | | | name-rev: include taggerdate in considering the best namejs/name-rev-use-oldest-refJohannes Schindelin2016-04-222-7/+14
| |/ / / / /
* | | | | | Start preparing for 2.8.4Junio C Hamano2016-05-261-0/+27
* | | | | | Merge branch 'jc/linkgit-fix' into maintJunio C Hamano2016-05-268-10/+10
|\ \ \ \ \ \
| * | | | | | Documentation: fix linkgit referencesjc/linkgit-fixJunio C Hamano2016-05-098-10/+10
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'ls/travis-build-doc' into maintJunio C Hamano2016-05-262-0/+29
|\ \ \ \ \ \
| * | | | | | travis-ci: build documentationls/travis-build-docLars Schneider2016-05-102-0/+29
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'jc/fsck-nul-in-commit' into maintJunio C Hamano2016-05-262-3/+31
|\ \ \ \ \ \
| * | | | | | fsck: detect and warn a commit with embedded NULjc/fsck-nul-in-commitJunio C Hamano2016-05-102-0/+26
| * | | | | | fsck_commit_buffer(): do not special case the last validationJunio C Hamano2016-04-141-3/+5
* | | | | | | Merge branch 'jk/rebase-interative-eval-fix' into maintJunio C Hamano2016-05-261-0/+1
|\ \ \ \ \ \ \
| * | | | | | | rebase--interactive: avoid empty list in shell for-loopjk/rebase-interative-eval-fixjk/rebase-interactive-eval-fixJeff King2016-05-101-0/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'js/windows-dotgit' into maintJunio C Hamano2016-05-268-3/+147
|\ \ \ \ \ \ \
| * | | | | | | mingw: remove unnecessary definitionjs/windows-dotgitJohannes Schindelin2016-05-111-3/+0
| * | | | | | | mingw: introduce the 'core.hideDotFiles' settingJohannes Schindelin2016-05-117-0/+147
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'kf/gpg-sig-verification-doc' into maintJunio C Hamano2016-05-262-4/+7
|\ \ \ \ \ \ \
| * | | | | | | Documentation: clarify signature verificationkf/gpg-sig-verification-docKeller Fuchs2016-05-132-4/+7
| |/ / / / / /
* | | | | | | Merge branch 'lp/typofixes' into maintJunio C Hamano2016-05-2612-14/+14
|\ \ \ \ \ \ \
| * | | | | | | typofix: assorted typofixes in comments, documentation and messageslp/typofixesLi Peng2016-05-0612-14/+14
| |/ / / / / /
* | | | | | | Merge branch 'sb/z-is-gnutar-ism' into maintJunio C Hamano2016-05-262-4/+4
|\ \ \ \ \ \ \
| * | | | | | | t6041: do not compress backup tar filesb/z-is-gnutar-ismStefan Beller2016-05-091-2/+2
| * | | | | | | t3513: do not compress backup tar fileStefan Beller2016-05-091-2/+2
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'va/i18n-misc-updates' into maintJunio C Hamano2016-05-268-61/+111
|\ \ \ \ \ \ \
| * | | | | | | i18n: unpack-trees: avoid substituting only a verb in sentencesva/i18n-misc-updatesVasco Almeida2016-05-122-22/+56
| * | | | | | | i18n: builtin/pull.c: split strings marked for translationVasco Almeida2016-04-191-4/+4
| * | | | | | | i18n: builtin/pull.c: mark placeholders for translationVasco Almeida2016-04-191-3/+3
| * | | | | | | i18n: git-parse-remote.sh: mark strings for translationVasco Almeida2016-04-192-18/+30
| * | | | | | | i18n: branch: move comment for translatorsVasco Almeida2016-04-131-2/+4