summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* rebase -i: improve advice on bad instruction linesrt/rebase-i-broken-insn-adviseRalf Thielow2016-09-072-4/+4
* Git 2.10v2.10.0Junio C Hamano2016-09-022-1/+6
* Merge tag 'l10n-2.10.0-rnd2.2' of git://github.com/git-l10n/git-poJunio C Hamano2016-09-021-374/+317
|\
| * Merge branch 'master' of https://github.com/vnwildman/gitJiang Xin2016-09-021-374/+317
| |\ |/ /
| * l10n: Updated Vietnamese translation for v2.10.0-rc2 (2757t)Tran Ngoc Quan2016-08-281-374/+317
* | A few more fixes before the final 2.10Junio C Hamano2016-08-311-3/+8
* | Merge tag 'l10n-2.10.0-rnd2' of git://github.com/git-l10n/git-poJunio C Hamano2016-08-318-14691/+24337
|\ \
| * | l10n: zh_CN: for git v2.10.0 l10n round 2Jiang Xin2016-08-311-1755/+2746
| * | l10n: ca.po: update translationAlex Henrie2016-08-281-2262/+3751
| * | l10n: fr.po v2.10.0-rc2Jean-Noel Avila2016-08-281-1796/+3072
| * | l10n: sv.po: Update Swedish translation (2757t0f0u)Peter Krefting2016-08-271-1791/+3043
| |/
| * Merge branch 'master' of https://github.com/vnwildman/gitJiang Xin2016-08-271-1780/+3085
| |\
| | * l10n: Updated Vietnamese translation for v2.10.0 (2789t)Tran Ngoc Quan2016-08-271-1780/+3085
| * | l10n: git.pot: v2.10.0 round 2 (12 new, 44 removed)Jiang Xin2016-08-271-342/+189
| * | Merge branch 'master' of git://github.com/git-l10n/git-poJiang Xin2016-08-273-5296/+8782
| |\ \
| | * | l10n: pt_PT: update Portuguese translationVasco Almeida2016-08-251-428/+507
| | * | l10n: pt_PT: merge git.potVasco Almeida2016-08-251-1793/+3017
| | |/
| | * l10n: ko.po: Update Korean translationChangwoo Ryu2016-08-221-1757/+2908
| | * l10n: git.pot: v2.10.0 round 1 (248 new, 56 removed)Jiang Xin2016-08-151-1712/+2744
* | | Merge branch 'ls/packet-line-protocol-doc-fix'Junio C Hamano2016-08-311-3/+3
|\ \ \
| * | | pack-protocol: fix maximum pkt-line sizels/packet-line-protocol-doc-fixLars Schneider2016-08-301-3/+3
* | | | Merge branch 'mh/blame-worktree'Junio C Hamano2016-08-312-1/+7
|\ \ \ \
| * | | | blame: fix segfault on untracked filesmh/blame-worktreeThomas Gummerer2016-08-292-1/+7
* | | | | Merge branch 'kw/patch-ids-optim'Junio C Hamano2016-08-311-0/+0
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | p3400: make test script executablekw/patch-ids-optimRené Scharfe2016-08-291-0/+0
* | | | | Git 2.10-rc2v2.10.0-rc2Junio C Hamano2016-08-262-1/+4
* | | | | gitattributes: Document the unified "auto" handlingTorsten Bögershausen2016-08-261-34/+24
* | | | | Prepare for 2.10.0-rc2Junio C Hamano2016-08-251-2/+29
* | | | | Merge branch 'ja/i18n'Junio C Hamano2016-08-253-71/+20
|\ \ \ \ \
| * | | | | i18n: simplify numeric error reportingja/i18nJean-Noel Avila2016-08-241-28/+16
| * | | | | i18n: fix git rebase interactive commit messagesJean-Noel Avila2016-08-241-42/+3
| * | | | | i18n: fix typos for translationJean-Noel Avila2016-08-241-1/+1
* | | | | | Merge branch 'bw/mingw-avoid-inheriting-fd-to-lockfile'Junio C Hamano2016-08-256-1/+35
|\ \ \ \ \ \
| * | | | | | mingw: ensure temporary file handles are not inherited by child processesbw/mingw-avoid-inheriting-fd-to-lockfileBen Wijen2016-08-236-2/+23
| * | | | | | t6026-merge-attr: child processes must not inherit index.lock handlesBen Wijen2016-08-181-0/+13
* | | | | | | Merge branch 'dg/document-git-c-in-git-config-doc'Junio C Hamano2016-08-251-0/+3
|\ \ \ \ \ \ \
| * | | | | | | doc: mention `git -c` in git-config(1)dg/document-git-c-in-git-config-docDavid Glasser2016-08-231-0/+3
* | | | | | | | Merge branch 'js/no-html-bypass-on-windows'Junio C Hamano2016-08-253-52/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert "display HTML in default browser using Windows' shell API"js/no-html-bypass-on-windowsJohannes Schindelin2016-08-193-52/+0
| |/ / / / / / /
* | | | | | | | Merge branch 'hv/doc-commit-reference-style'Junio C Hamano2016-08-251-0/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | SubmittingPatches: document how to reference previous commitsHeiko Voigt2016-08-171-0/+5
| |/ / / / / / /
* | | | | | | | git ls-files: text=auto eol=lf is supported in Git 2.10Torsten Bögershausen2016-08-251-2/+1
| |_|/ / / / / |/| | | | | |
* | | | | | | Git 2.10-rc1v2.10.0-rc1Junio C Hamano2016-08-192-1/+32
* | | | | | | Merge branch 'lt/gpg-show-long-key-in-signature-verification'Junio C Hamano2016-08-191-0/+1
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'lt/gpg-show-long-key-in-signature-verification-maint' into lt/g...lt/gpg-show-long-key-in-signature-verificationJunio C Hamano2016-08-161-0/+1
| |\ \ \ \ \ \ \
| | * | | | | | | gpg-interface: prefer "long" key format output when verifying pgp signatureslt/gpg-show-long-key-in-signature-verification-maintLinus Torvalds2016-08-161-2/+2
| | |/ / / / / /
* | | | | | | | Merge branch 'ab/hooks'Junio C Hamano2016-08-193-4/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | rev-parse: respect core.hooksPath in --git-pathab/hooksJohannes Schindelin2016-08-163-4/+9
* | | | | | | | | Merge branch 'jk/difftool-command-not-found'Junio C Hamano2016-08-192-0/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | difftool: always honor fatal error exit codesjk/difftool-command-not-foundJohn Keeping2016-08-152-0/+13
| | |_|_|/ / / / / | |/| | | | | | |