summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/connect-clear-env' into maintJunio C Hamano2015-10-162-10/+49
|\
| * git_connect: clarify conn->use_shell flagjk/connect-clear-envJeff King2015-09-081-9/+13
| * git_connect: clear GIT_* environment for sshJeff King2015-09-042-2/+36
* | Merge branch 'jk/blame-first-parent' into maintJunio C Hamano2015-10-162-1/+14
|\ \
| * | blame: handle --first-parentjk/blame-first-parentJeff King2015-09-162-1/+14
* | | Merge branch 'mm/keyid-docs' into maintJunio C Hamano2015-10-1610-29/+47
|\ \ \
| * | | Documentation: explain optional arguments bettermm/keyid-docsMatthieu Moy2015-09-219-10/+28
| * | | Documentation/grep: fix documentation of -OMatthieu Moy2015-09-211-2/+2
| * | | Documentation: use 'keyid' consistently, not 'key-id'Matthieu Moy2015-09-215-17/+17
* | | | Merge branch 'pt/pull-builtin' into maintJunio C Hamano2015-10-163-3/+3
|\ \ \ \
| * | | | pull: enclose <options> in brackets in the usage stringpt/pull-builtinAlex Henrie2015-10-161-1/+1
| * | | | merge: grammofix in please-commit-before-merge messageAlex Henrie2015-10-022-2/+2
* | | | | Git 2.6.1v2.6.1Junio C Hamano2015-09-284-3/+22
* | | | | Sync with v2.5.4Junio C Hamano2015-09-2829-30/+486
|\ \ \ \ \
| * | | | | Git 2.5.4v2.5.4Junio C Hamano2015-09-284-3/+22
| * | | | | Sync with 2.4.10Junio C Hamano2015-09-2828-29/+466
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Git 2.4.10v2.4.10Junio C Hamano2015-09-284-3/+22
| | * | | | Sync with 2.3.10Junio C Hamano2015-09-2827-28/+446
| | |\ \ \ \
| | | * | | | Git 2.3.10v2.3.10maint-2.3Junio C Hamano2015-09-284-3/+22
| | | * | | | Merge branch 'jk/xdiff-memory-limits' into maint-2.3Junio C Hamano2015-09-2811-26/+57
| | | |\ \ \ \
| | | | * | | | merge-file: enforce MAX_XDIFF_SIZE on incoming filesJeff King2015-09-281-1/+2
| | | | * | | | xdiff: reject files larger than ~1GBJeff King2015-09-283-1/+14
| | | | * | | | react to errors in xdi_diffJeff King2015-09-287-24/+41
| | | * | | | | Merge branch 'jk/transfer-limit-redirection' into maint-2.3Junio C Hamano2015-09-286-15/+78
| | | |\ \ \ \ \
| | | | * | | | | http: limit redirection depthBlake Burkhart2015-09-253-0/+8
| | | | * | | | | http: limit redirection to protocol-whitelistBlake Burkhart2015-09-254-5/+27
| | | | * | | | | transport: refactor protocol whitelist codeJeff King2015-09-252-10/+43
| | | * | | | | | Merge branch 'jk/transfer-limit-protocol' into maint-2.3Junio C Hamano2015-09-2813-1/+306
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | | | / / / / | | | | |/ / / / | | | |/| | | |
| | | | * | | | submodule: allow only certain protocols for submodule fetchesJeff King2015-09-232-0/+52
| | | | * | | | transport: add a protocol-whitelist environment variableJeff King2015-09-2311-1/+254
| | | |/ / / /
* | | | | | | Git 2.6v2.6.0Junio C Hamano2015-09-282-1/+6
* | | | | | | Git 2.6-rc3v2.6.0-rc3Junio C Hamano2015-09-211-1/+1
* | | | | | | Merge branch 'rj/mailmap-ramsay'Junio C Hamano2015-09-211-1/+1
|\ \ \ \ \ \ \
| * | | | | | | mailmap: update my entry with new email addressrj/mailmap-ramsayRamsay Jones2015-09-161-1/+1
* | | | | | | | Merge branch 'bn/send-email-smtp-auth-error-message-fix'Junio C Hamano2015-09-211-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | send-email: fix uninitialized var warning for $smtp_authbn/send-email-smtp-auth-error-message-fixBrian Norris2015-09-211-1/+1
* | | | | | | | | Merge tag 'l10n-2.6.0-rnd2+de' of git://github.com/git-l10n/git-poJunio C Hamano2015-09-218-11681/+14967
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | l10n: de.po: better language for one stringPhillip Sz2015-09-201-1/+1
| * | | | | | | | | l10n: de.po: translate 2 messagesRalf Thielow2015-09-201-101/+108
| * | | | | | | | | l10n: Update and review Vietnamese translation (2440t)Tran Ngoc Quan2015-09-211-91/+90
| * | | | | | | | | l10n: fr.po v2.6.0 round 2 (2440t)Jean-Noel Avila2015-09-211-112/+148
| * | | | | | | | | l10n: zh_CN: for git v2.6.0 l10n round 2Jiang Xin2015-09-211-78/+77
| * | | | | | | | | l10n: ca.po: update translationAlex Henrie2015-09-211-1760/+2159
| * | | | | | | | | l10n: git.pot: v2.6.0 round 2 (3 improvements)Jiang Xin2015-09-211-76/+72
| * | | | | | | | | Merge branch 'master' of git://github.com/git-l10n/git-poJiang Xin2015-09-217-9913/+12763
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| | * | | | | | | | l10n: de.po: translate 123 new messagesRalf Thielow2015-09-211-1640/+2125
| | * | | | | | | | l10n: fr.po v2.6.0 round 1 (2441t)Jean-Noel Avila2015-09-211-1638/+2086
| | * | | | | | | | Merge branch 'master' of github.com:jiangxin/gitJiang Xin2015-09-102-1814/+2390
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | l10n: zh_CN: for git v2.6.0 l10n round 1Jiang Xin2015-09-081-1607/+2067
| | | * | | | | | | | Merge branch 'master' of github.com:jiangxin/git into masterJiang Xin2015-09-052-214/+330
| | | |\ \ \ \ \ \ \ \