summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/rev-list-has-no-notes'Junio C Hamano2015-08-314-0/+9
|\
| * rev-list: make it obvious that we do not support notesjk/rev-list-has-no-notesJeff King2015-08-244-0/+9
* | Merge branch 'hv/submodule-config'Junio C Hamano2015-08-3112-98/+836
|\ \
| * | submodule: allow erroneous values for the fetchRecurseSubmodules optionhv/submodule-configHeiko Voigt2015-08-196-17/+66
| * | submodule: use new config API for worktree configurationsHeiko Voigt2015-08-199-138/+104
| * | submodule: extract functions for config set and lookupHeiko Voigt2015-08-191-45/+97
| * | submodule: implement a config API for lookup of .gitmodules valuesHeiko Voigt2015-08-199-0/+671
* | | Merge branch 'sg/config-name-only'Junio C Hamano2015-08-314-60/+74
|\ \ \
| * | | get_urlmatch: avoid useless strbuf writesg/config-name-onlyJeff King2015-08-201-4/+1
| * | | format_config: simplify buffer handlingJeff King2015-08-201-22/+16
| * | | format_config: don't init strbufJeff King2015-08-201-2/+1
| * | | config: restructure format_config() for better control flowSZEDER Gábor2015-08-201-41/+37
| * | | completion: list variable names reliably with 'git config --name-only'SZEDER Gábor2015-08-101-12/+3
| * | | config: add '--name-only' option to list only variable namesSZEDER Gábor2015-08-104-5/+42
* | | | Sync with 2.5.1Junio C Hamano2015-08-283-2/+19
|\ \ \ \
| * | | | Git 2.5.1v2.5.1Junio C Hamano2015-08-283-2/+19
| * | | | Mingw: verify both ends of the pipe () callJose F. Morales2015-08-281-1/+1
* | | | | Seventh batch for 2.6Junio C Hamano2015-08-281-0/+8
* | | | | Merge branch 'cc/trailers-corner-case-fix'Junio C Hamano2015-08-282-2/+17
|\ \ \ \ \
| * | | | | trailer: retitle a test and correct an in-comment messageChristian Couder2015-08-262-2/+3
| * | | | | trailer: ignore first line of messageChristian Couder2015-08-212-2/+16
* | | | | | Merge branch 'dt/untracked-subdir'Junio C Hamano2015-08-282-20/+162
|\ \ \ \ \ \
| * | | | | | untracked cache: fix entry invalidationdt/untracked-subdirNguyễn Thái Ngọc Duy2015-08-192-13/+83
| * | | | | | untracked-cache: fix subdirectory handlingDavid Turner2015-08-192-7/+79
* | | | | | | Sixth batch for 2.6Junio C Hamano2015-08-261-0/+17
* | | | | | | Merge branch 'sg/help-group'Junio C Hamano2015-08-263-52/+52
|\ \ \ \ \ \ \
| * | | | | | | generate-cmdlist: re-implement as shell scriptEric Sunshine2015-08-253-52/+52
* | | | | | | | Merge branch 'sg/wt-status-header-inclusion'Junio C Hamano2015-08-262-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | wt-status: move #include "pathspec.h" to the headersg/wt-status-header-inclusionSZEDER Gábor2015-08-212-1/+1
* | | | | | | | | Merge branch 'as/docfix-reflog-expire-unreachable'Junio C Hamano2015-08-261-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Documentation/config: fix inconsistent label on gc.*.reflogExpireUnreachableas/docfix-reflog-expire-unreachableAndreas Schwab2015-08-211-1/+1
* | | | | | | | | | Merge branch 'sg/t3020-typofix'Junio C Hamano2015-08-261-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t3020: fix typo in test descriptionsg/t3020-typofixSZEDER Gábor2015-08-201-1/+1
* | | | | | | | | | | Merge branch 'jc/calloc-pathspec'Junio C Hamano2015-08-262-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | ps_matched: xcalloc() takes nmemb and then element sizejc/calloc-pathspecJunio C Hamano2015-08-202-2/+2
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'dt/untracked-sparse'Junio C Hamano2015-08-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | t7063: use --force-untracked-cache to speed up a bitdt/untracked-sparseNguyễn Thái Ngọc Duy2015-08-191-1/+1
* | | | | | | | | | | Merge branch 'pt/am-builtin'Junio C Hamano2015-08-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | i18n: am: fix typo in description of -b optionJiang Xin2015-08-261-1/+1
* | | | | | | | | | | | Merge branch 'pt/am-builtin-abort-fix'Junio C Hamano2015-08-262-13/+60
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | am --skip/--abort: merge HEAD/ORIG_HEAD tree into indexpt/am-builtin-abort-fixPaul Tan2015-08-192-13/+60
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'po/po-readme'Junio C Hamano2015-08-261-0/+19
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | po/README: Update directions for l10n contributorspo/po-readmePhilip Oakley2015-08-171-0/+19
* | | | | | | | | | | | | Merge branch 'jv/send-email-selective-smtp-auth'Junio C Hamano2015-08-262-1/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | send-email: provide whitelist of SMTP AUTH mechanismsjv/send-email-selective-smtp-authJan Viktorin2015-08-172-1/+38
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'ep/http-configure-ssl-version'Junio C Hamano2015-08-263-1/+56
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | http: add support for specifying the SSL versionep/http-configure-ssl-versionElia Pinto2015-08-173-1/+56
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'ss/fix-config-fd-leak'Junio C Hamano2015-08-261-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | config: close config file handle in case of errorss/fix-config-fd-leakSven Strickroth2015-08-141-1/+4
* | | | | | | | | | | | | | Sync with maintJunio C Hamano2015-08-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |