Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Git 2.6-rc0v2.6.0-rc0 | Junio C Hamano | 2015-09-02 | 1 | -3/+12 |
* | Ninth batch for 2.6 | Junio C Hamano | 2015-09-01 | 1 | -0/+22 |
* | Merge branch 'br/svn-doc-include-paths-config' | Junio C Hamano | 2015-09-01 | 1 | -0/+3 |
|\ | |||||
| * | git-svn doc: mention "svn-remote.<name>.include-paths"br/svn-doc-include-paths-config | Brett Randall | 2015-08-26 | 1 | -0/+3 |
* | | Eighth batch for 2.6 | Junio C Hamano | 2015-08-31 | 1 | -0/+39 |
* | | Merge branch 'sg/describe-contains' | Junio C Hamano | 2015-08-31 | 1 | -2/+2 |
|\ \ | |||||
| * | | describe --contains: default to HEAD when no commit-ish is givensg/describe-contains | SZEDER Gábor | 2015-08-25 | 1 | -2/+2 |
* | | | Merge branch 'db/push-sign-if-asked' | Junio C Hamano | 2015-08-31 | 4 | -6/+36 |
|\ \ \ | |||||
| * | | | push: add a config option push.gpgSign for default signed pushesdb/push-sign-if-asked | Dave Borowitz | 2015-08-19 | 1 | -0/+8 |
| * | | | push: support signing pushes iff the server supports it | Dave Borowitz | 2015-08-19 | 2 | -13/+20 |
| * | | | gitremote-helpers.txt: document pushcert option | Dave Borowitz | 2015-08-19 | 1 | -0/+3 |
| * | | | Documentation/git-send-pack.txt: document --signed | Dave Borowitz | 2015-08-19 | 1 | -1/+9 |
| * | | | Documentation/git-send-pack.txt: wrap long synopsis line | Dave Borowitz | 2015-08-19 | 1 | -1/+3 |
| * | | | Documentation/git-push.txt: document when --signed may fail | Dave Borowitz | 2015-08-19 | 1 | -1/+3 |
* | | | | Merge branch 'jk/notes-merge-config' | Junio C Hamano | 2015-08-31 | 2 | -5/+36 |
|\ \ \ \ | |||||
| * | | | | notes: teach git-notes about notes.<name>.mergeStrategy optionjk/notes-merge-config | Jacob Keller | 2015-08-17 | 2 | -0/+12 |
| * | | | | notes: add notes.mergeStrategy option to select default strategy | Jacob Keller | 2015-08-17 | 2 | -1/+19 |
| * | | | | notes: document cat_sort_uniq rewriteMode | Jacob Keller | 2015-08-17 | 2 | -4/+5 |
* | | | | | Merge branch 'jk/rev-list-has-no-notes' | Junio C Hamano | 2015-08-31 | 3 | -0/+6 |
|\ \ \ \ \ | |||||
| * | | | | | rev-list: make it obvious that we do not support notesjk/rev-list-has-no-notes | Jeff King | 2015-08-24 | 3 | -0/+6 |
* | | | | | | Merge branch 'hv/submodule-config' | Junio C Hamano | 2015-08-31 | 1 | -0/+62 |
|\ \ \ \ \ \ | |||||
| * | | | | | | submodule: use new config API for worktree configurations | Heiko Voigt | 2015-08-19 | 1 | -1/+18 |
| * | | | | | | submodule: implement a config API for lookup of .gitmodules values | Heiko Voigt | 2015-08-19 | 1 | -0/+45 |
* | | | | | | | Merge branch 'sg/config-name-only' | Junio C Hamano | 2015-08-31 | 1 | -3/+7 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | config: add '--name-only' option to list only variable names | SZEDER Gábor | 2015-08-10 | 1 | -3/+7 |
* | | | | | | | | Sync with 2.5.1 | Junio C Hamano | 2015-08-28 | 2 | -1/+18 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Git 2.5.1v2.5.1 | Junio C Hamano | 2015-08-28 | 2 | -1/+18 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Seventh batch for 2.6 | Junio C Hamano | 2015-08-28 | 1 | -0/+8 |
* | | | | | | | | Sixth batch for 2.6 | Junio C Hamano | 2015-08-26 | 1 | -0/+17 |
* | | | | | | | | 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 'jv/send-email-selective-smtp-auth' | Junio C Hamano | 2015-08-26 | 1 | -0/+13 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | send-email: provide whitelist of SMTP AUTH mechanismsjv/send-email-selective-smtp-auth | Jan Viktorin | 2015-08-17 | 1 | -0/+13 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'ep/http-configure-ssl-version' | Junio C Hamano | 2015-08-26 | 1 | -0/+23 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | http: add support for specifying the SSL versionep/http-configure-ssl-version | Elia Pinto | 2015-08-17 | 1 | -0/+23 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Fifth batch for 2.6 | Junio C Hamano | 2015-08-25 | 1 | -0/+33 |
* | | | | | | | | | Merge branch 'mh/tempfile' | Junio C Hamano | 2015-08-25 | 1 | -220/+0 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | lockfile: move documentation to lockfile.h and lockfile.c | Michael Haggerty | 2015-08-10 | 1 | -220/+0 |
* | | | | | | | | | | Merge branch 'dt/refs-pseudo' | Junio C Hamano | 2015-08-25 | 1 | -0/+21 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | refs: introduce pseudoref and per-worktree ref concepts | David Turner | 2015-07-31 | 1 | -0/+21 |
* | | | | | | | | | | | Sync with maint | Junio C Hamano | 2015-08-19 | 1 | -0/+49 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Start preparing for 2.5.1 | Junio C Hamano | 2015-08-19 | 1 | -0/+49 |
| * | | | | | | | | | | Merge branch 'ta/docfix-index-format-tech' into maint | Junio C Hamano | 2015-08-19 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'kn/tag-doc-fix' into maint | Junio C Hamano | 2015-08-19 | 1 | -1/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'es/doc-clean-outdated-tools' into maint | Junio C Hamano | 2015-08-19 | 2 | -117/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ib/scripted-parse-opt-better-hint-string' into maint | Junio C Hamano | 2015-08-19 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'se/doc-checkout-ours-theirs' into maint | Junio C Hamano | 2015-08-19 | 1 | -0/+15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | | | | | | | Fourth batch for 2.6 | Junio C Hamano | 2015-08-19 | 1 | -1/+34 |
* | | | | | | | | | | | | | | | | Merge branch 'jk/negative-hiderefs' | Junio C Hamano | 2015-08-19 | 1 | -17/+20 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | refs: support negative transfer.hideRefsjk/negative-hiderefs | Jeff King | 2015-08-07 | 1 | -0/+5 |