summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* use string_list initializer consistentlyjk/string-list-static-initJeff King2016-06-138-13/+13
* Merge branch 'jk/parseopt-string-list' into jk/string-list-static-initJunio C Hamano2016-06-134-11/+11
|\
| * blame,shortlog: don't make local option variables staticJeff King2016-06-132-9/+9
| * interpret-trailers: don't duplicate option stringsJeff King2016-06-131-1/+1
| * parse_opt_string_list: stop allocating new stringsJeff King2016-06-131-1/+1
* | Merge branch 'jk/submodule-c-credential'Junio C Hamano2016-05-176-103/+63
|\ \
| * | submodule: stop sanitizing config optionsjk/submodule-c-credentialJeff King2016-05-065-93/+4
| * | submodule: use prepare_submodule_repo_env consistentlyjk/submodule-config-sanitize-fixJeff King2016-04-282-7/+18
| * | submodule--helper: move config-sanitizing to submodule.cJeff King2016-04-283-48/+64
| * | submodule: export sanitized GIT_CONFIG_PARAMETERSJeff King2016-04-282-0/+18
| * | t5550: break submodule config test into multiple sub-testsJeff King2016-04-281-2/+6
| * | t5550: fix typo in $HTTPD_URLJeff King2016-04-281-1/+1
* | | Merge branch 'nd/remote-plural-ours-plus-theirs'Junio C Hamano2016-05-171-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 'bn/config-doc-tt-varnames'Junio C Hamano2016-05-171-11/+11
|\ \ \
| * | | config: consistently format $variables in monospaced fontbn/config-doc-tt-varnamesBrian Norris2016-05-051-11/+11
* | | | Merge branch 'va/i18n-misc-updates'Junio C Hamano2016-05-178-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 'js/t3404-typofix'Junio C Hamano2016-05-171-1/+1
|\ \ \ \ \
| * | | | | t3404: fix typojs/t3404-typofixJohannes Schindelin2016-05-101-1/+1
* | | | | | Merge branch 'sb/z-is-gnutar-ism'Junio C Hamano2016-05-172-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 'lp/typofixes'Junio C Hamano2016-05-1712-14/+14
|\ \ \ \ \ \ \
| * | | | | | | typofix: assorted typofixes in comments, documentation and messageslp/typofixesLi Peng2016-05-0612-14/+14
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'sb/submodule-deinit-all'Junio C Hamano2016-05-173-10/+48
|\ \ \ \ \ \ \
| * | | | | | | submodule deinit: require '--all' instead of '.' for all submodulesStefan Beller2016-05-053-10/+48
| |/ / / / / /
* | | | | | | Merge branch 'jc/config-pathname-type'Junio C Hamano2016-05-171-11/+19
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | config: describe 'pathname' value typejc/config-pathname-typeJunio C Hamano2016-05-041-11/+19
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'bn/http-cookiefile-config'Junio C Hamano2016-05-172-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 'ab/hooks'Junio C Hamano2016-05-178-32/+112
|\ \ \ \ \ \
| * | | | | | hooks: allow customizing where the hook directory isÆvar Arnfjörð Bjarmason2016-05-047-5/+71
| * | | | | | githooks.txt: minor improvements to the grammar & phrasingÆvar Arnfjörð Bjarmason2016-05-041-16/+16
| * | | | | | githooks.txt: amend dangerous advice about 'update' hook ACLÆvar Arnfjörð Bjarmason2016-05-041-3/+5
| * | | | | | githooks.txt: improve the intro sectionÆvar Arnfjörð Bjarmason2016-05-042-13/+25
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'sb/submodule-init'Junio C Hamano2016-05-177-141/+461
|\ \ \ \ \ \
| * | | | | | submodule init: redirect stdout to stderrStefan Beller2016-05-032-7/+20
| * | | | | | submodule--helper update-clone: abort gracefully on missing .gitmodulesStefan Beller2016-04-292-13/+33
| * | | | | | submodule init: fail gracefully with a missing .gitmodules fileStefan Beller2016-04-292-3/+15