Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/rev-list-has-no-notes' | Junio C Hamano | 2015-08-31 | 4 | -0/+9 |
|\ | |||||
| * | rev-list: make it obvious that we do not support notesjk/rev-list-has-no-notes | Jeff King | 2015-08-24 | 4 | -0/+9 |
* | | Merge branch 'hv/submodule-config' | Junio C Hamano | 2015-08-31 | 12 | -98/+836 |
|\ \ | |||||
| * | | submodule: allow erroneous values for the fetchRecurseSubmodules optionhv/submodule-config | Heiko Voigt | 2015-08-19 | 6 | -17/+66 |
| * | | submodule: use new config API for worktree configurations | Heiko Voigt | 2015-08-19 | 9 | -138/+104 |
| * | | submodule: extract functions for config set and lookup | Heiko Voigt | 2015-08-19 | 1 | -45/+97 |
| * | | submodule: implement a config API for lookup of .gitmodules values | Heiko Voigt | 2015-08-19 | 9 | -0/+671 |
* | | | Merge branch 'sg/config-name-only' | Junio C Hamano | 2015-08-31 | 4 | -60/+74 |
|\ \ \ | |||||
| * | | | get_urlmatch: avoid useless strbuf writesg/config-name-only | Jeff King | 2015-08-20 | 1 | -4/+1 |
| * | | | format_config: simplify buffer handling | Jeff King | 2015-08-20 | 1 | -22/+16 |
| * | | | format_config: don't init strbuf | Jeff King | 2015-08-20 | 1 | -2/+1 |
| * | | | config: restructure format_config() for better control flow | SZEDER Gábor | 2015-08-20 | 1 | -41/+37 |
| * | | | completion: list variable names reliably with 'git config --name-only' | SZEDER Gábor | 2015-08-10 | 1 | -12/+3 |
| * | | | config: add '--name-only' option to list only variable names | SZEDER Gábor | 2015-08-10 | 4 | -5/+42 |
* | | | | Sync with 2.5.1 | Junio C Hamano | 2015-08-28 | 3 | -2/+19 |
|\ \ \ \ | |||||
| * | | | | Git 2.5.1v2.5.1 | Junio C Hamano | 2015-08-28 | 3 | -2/+19 |
| * | | | | Mingw: verify both ends of the pipe () call | Jose F. Morales | 2015-08-28 | 1 | -1/+1 |
* | | | | | Seventh batch for 2.6 | Junio C Hamano | 2015-08-28 | 1 | -0/+8 |
* | | | | | Merge branch 'cc/trailers-corner-case-fix' | Junio C Hamano | 2015-08-28 | 2 | -2/+17 |
|\ \ \ \ \ | |||||
| * | | | | | trailer: retitle a test and correct an in-comment message | Christian Couder | 2015-08-26 | 2 | -2/+3 |
| * | | | | | trailer: ignore first line of message | Christian Couder | 2015-08-21 | 2 | -2/+16 |
* | | | | | | Merge branch 'dt/untracked-subdir' | Junio C Hamano | 2015-08-28 | 2 | -20/+162 |
|\ \ \ \ \ \ | |||||
| * | | | | | | untracked cache: fix entry invalidationdt/untracked-subdir | Nguyễn Thái Ngọc Duy | 2015-08-19 | 2 | -13/+83 |
| * | | | | | | untracked-cache: fix subdirectory handling | David Turner | 2015-08-19 | 2 | -7/+79 |
* | | | | | | | Sixth batch for 2.6 | Junio C Hamano | 2015-08-26 | 1 | -0/+17 |
* | | | | | | | Merge branch 'sg/help-group' | Junio C Hamano | 2015-08-26 | 3 | -52/+52 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | generate-cmdlist: re-implement as shell script | Eric Sunshine | 2015-08-25 | 3 | -52/+52 |
* | | | | | | | | Merge branch 'sg/wt-status-header-inclusion' | Junio C Hamano | 2015-08-26 | 2 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | wt-status: move #include "pathspec.h" to the headersg/wt-status-header-inclusion | SZEDER Gábor | 2015-08-21 | 2 | -1/+1 |
* | | | | | | | | | Merge branch 'as/docfix-reflog-expire-unreachable' | Junio C Hamano | 2015-08-26 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Documentation/config: fix inconsistent label on gc.*.reflogExpireUnreachableas/docfix-reflog-expire-unreachable | Andreas Schwab | 2015-08-21 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'sg/t3020-typofix' | Junio C Hamano | 2015-08-26 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | t3020: fix typo in test descriptionsg/t3020-typofix | SZEDER Gábor | 2015-08-20 | 1 | -1/+1 |
* | | | | | | | | | | | Merge branch 'jc/calloc-pathspec' | Junio C Hamano | 2015-08-26 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | ps_matched: xcalloc() takes nmemb and then element sizejc/calloc-pathspec | Junio C Hamano | 2015-08-20 | 2 | -2/+2 |
| | |_|/ / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'dt/untracked-sparse' | Junio C Hamano | 2015-08-26 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | t7063: use --force-untracked-cache to speed up a bitdt/untracked-sparse | Nguyễn Thái Ngọc Duy | 2015-08-19 | 1 | -1/+1 |
* | | | | | | | | | | | Merge branch 'pt/am-builtin' | Junio C Hamano | 2015-08-26 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | i18n: am: fix typo in description of -b option | Jiang Xin | 2015-08-26 | 1 | -1/+1 |
* | | | | | | | | | | | | Merge branch 'pt/am-builtin-abort-fix' | Junio C Hamano | 2015-08-26 | 2 | -13/+60 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | am --skip/--abort: merge HEAD/ORIG_HEAD tree into indexpt/am-builtin-abort-fix | Paul Tan | 2015-08-19 | 2 | -13/+60 |
| |/ / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge branch 'po/po-readme' | Junio C Hamano | 2015-08-26 | 1 | -0/+19 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | po/README: Update directions for l10n contributorspo/po-readme | Philip Oakley | 2015-08-17 | 1 | -0/+19 |
* | | | | | | | | | | | | | Merge branch 'jv/send-email-selective-smtp-auth' | Junio C Hamano | 2015-08-26 | 2 | -1/+38 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | send-email: provide whitelist of SMTP AUTH mechanismsjv/send-email-selective-smtp-auth | Jan Viktorin | 2015-08-17 | 2 | -1/+38 |
| |/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Merge branch 'ep/http-configure-ssl-version' | Junio C Hamano | 2015-08-26 | 3 | -1/+56 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | http: add support for specifying the SSL versionep/http-configure-ssl-version | Elia Pinto | 2015-08-17 | 3 | -1/+56 |
| |/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Merge branch 'ss/fix-config-fd-leak' | Junio C Hamano | 2015-08-26 | 1 | -1/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | config: close config file handle in case of errorss/fix-config-fd-leak | Sven Strickroth | 2015-08-14 | 1 | -1/+4 |
* | | | | | | | | | | | | | | Sync with maint | Junio C Hamano | 2015-08-25 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | |