summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* t2300: "git --exec-path" is not usable in $PATH on Windows as-isjc/t2300-setupJohannes Schindelin2016-06-221-1/+9
* t2300: run git-sh-setup in an environment that better mimics the real lifeJunio C Hamano2016-06-011-1/+2
* 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
| * | | | | | i18n: branch: unmark string for translationVasco Almeida2016-04-131-2/+2
| * | | | | | i18n: builtin/rm.c: remove a comma ',' from stringVasco Almeida2016-04-121-1/+1
| * | | | | | i18n: unpack-trees: mark strings for translationVasco Almeida2016-04-121-12/+12
| * | | | | | i18n: builtin/branch.c: mark option for translationVasco Almeida2016-04-081-1/+1
| * | | | | | i18n: index-pack: use plural string instead of normal oneVasco Almeida2016-04-081-1/+3
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'bn/config-doc-tt-varnames' into maintJunio C Hamano2016-05-261-21/+29
|\ \ \ \ \ \
| * | | | | | config: consistently format $variables in monospaced fontbn/config-doc-tt-varnamesBrian Norris2016-05-051-11/+11
| * | | | | | config: describe 'pathname' value typejc/config-pathname-typeJunio C Hamano2016-05-041-11/+19
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'nd/remote-plural-ours-plus-theirs' into maintJunio C Hamano2016-05-261-1/+1
|\ \ \ \ \ \
| * | | | | | remote.c: specify correct plural form in "commit diverge" messagend/remote-plural-ours-plus-theirsNguyễn Thái Ngọc Duy2016-05-061-1/+1
| |/ / / / /
* | | | | | Merge branch 'ak/t4151-ls-files-could-be-empty' into maintJunio C Hamano2016-05-261-1/+1
|\ \ \ \ \ \
| * | | | | | t4151: make sure argument to 'test -z' is givenak/t4151-ls-files-could-be-emptyArmin Kunaschik2016-05-091-1/+1
| | |_|/ / / | |/| | | |