summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* Git 2.6-rc0v2.6.0-rc0Junio C Hamano2015-09-021-3/+12
* Ninth batch for 2.6Junio C Hamano2015-09-011-0/+22
* Merge branch 'br/svn-doc-include-paths-config'Junio C Hamano2015-09-011-0/+3
|\
| * git-svn doc: mention "svn-remote.<name>.include-paths"br/svn-doc-include-paths-configBrett Randall2015-08-261-0/+3
* | Eighth batch for 2.6Junio C Hamano2015-08-311-0/+39
* | Merge branch 'sg/describe-contains'Junio C Hamano2015-08-311-2/+2
|\ \
| * | describe --contains: default to HEAD when no commit-ish is givensg/describe-containsSZEDER Gábor2015-08-251-2/+2
* | | Merge branch 'db/push-sign-if-asked'Junio C Hamano2015-08-314-6/+36
|\ \ \
| * | | push: add a config option push.gpgSign for default signed pushesdb/push-sign-if-askedDave Borowitz2015-08-191-0/+8
| * | | push: support signing pushes iff the server supports itDave Borowitz2015-08-192-13/+20
| * | | gitremote-helpers.txt: document pushcert optionDave Borowitz2015-08-191-0/+3
| * | | Documentation/git-send-pack.txt: document --signedDave Borowitz2015-08-191-1/+9
| * | | Documentation/git-send-pack.txt: wrap long synopsis lineDave Borowitz2015-08-191-1/+3
| * | | Documentation/git-push.txt: document when --signed may failDave Borowitz2015-08-191-1/+3
* | | | Merge branch 'jk/notes-merge-config'Junio C Hamano2015-08-312-5/+36
|\ \ \ \
| * | | | notes: teach git-notes about notes.<name>.mergeStrategy optionjk/notes-merge-configJacob Keller2015-08-172-0/+12
| * | | | notes: add notes.mergeStrategy option to select default strategyJacob Keller2015-08-172-1/+19
| * | | | notes: document cat_sort_uniq rewriteModeJacob Keller2015-08-172-4/+5
* | | | | Merge branch 'jk/rev-list-has-no-notes'Junio C Hamano2015-08-313-0/+6
|\ \ \ \ \
| * | | | | rev-list: make it obvious that we do not support notesjk/rev-list-has-no-notesJeff King2015-08-243-0/+6
* | | | | | Merge branch 'hv/submodule-config'Junio C Hamano2015-08-311-0/+62
|\ \ \ \ \ \
| * | | | | | submodule: use new config API for worktree configurationsHeiko Voigt2015-08-191-1/+18
| * | | | | | submodule: implement a config API for lookup of .gitmodules valuesHeiko Voigt2015-08-191-0/+45
* | | | | | | Merge branch 'sg/config-name-only'Junio C Hamano2015-08-311-3/+7
|\ \ \ \ \ \ \
| * | | | | | | config: add '--name-only' option to list only variable namesSZEDER Gábor2015-08-101-3/+7
* | | | | | | | Sync with 2.5.1Junio C Hamano2015-08-282-1/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | Git 2.5.1v2.5.1Junio C Hamano2015-08-282-1/+18
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Seventh batch for 2.6Junio C Hamano2015-08-281-0/+8
* | | | | | | | Sixth batch for 2.6Junio C Hamano2015-08-261-0/+17
* | | | | | | | 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 'jv/send-email-selective-smtp-auth'Junio C Hamano2015-08-261-0/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | send-email: provide whitelist of SMTP AUTH mechanismsjv/send-email-selective-smtp-authJan Viktorin2015-08-171-0/+13
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ep/http-configure-ssl-version'Junio C Hamano2015-08-261-0/+23
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | http: add support for specifying the SSL versionep/http-configure-ssl-versionElia Pinto2015-08-171-0/+23
| |/ / / / / / / /
* | | | | | | | | Fifth batch for 2.6Junio C Hamano2015-08-251-0/+33
* | | | | | | | | Merge branch 'mh/tempfile'Junio C Hamano2015-08-251-220/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | lockfile: move documentation to lockfile.h and lockfile.cMichael Haggerty2015-08-101-220/+0
* | | | | | | | | | Merge branch 'dt/refs-pseudo'Junio C Hamano2015-08-251-0/+21
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | refs: introduce pseudoref and per-worktree ref conceptsDavid Turner2015-07-311-0/+21
* | | | | | | | | | | Sync with maintJunio C Hamano2015-08-191-0/+49
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Start preparing for 2.5.1Junio C Hamano2015-08-191-0/+49
| * | | | | | | | | | Merge branch 'ta/docfix-index-format-tech' into maintJunio C Hamano2015-08-191-1/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'kn/tag-doc-fix' into maintJunio C Hamano2015-08-191-1/+0
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'es/doc-clean-outdated-tools' into maintJunio C Hamano2015-08-192-117/+9
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ib/scripted-parse-opt-better-hint-string' into maintJunio C Hamano2015-08-191-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'se/doc-checkout-ours-theirs' into maintJunio C Hamano2015-08-191-0/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | Fourth batch for 2.6Junio C Hamano2015-08-191-1/+34
* | | | | | | | | | | | | | | | Merge branch 'jk/negative-hiderefs'Junio C Hamano2015-08-191-17/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | refs: support negative transfer.hideRefsjk/negative-hiderefsJeff King2015-08-071-0/+5