summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2016-11-10Revert "t6026-merge-attr: ensure that the merge driver was called"Libravatar Junio C Hamano1-2/+1
2016-11-10t6026-merge-attr: ensure that the merge driver was calledLibravatar Andreas Schwab1-1/+2
2016-11-08t6026-merge-attr: don't fail if sleep exits earlyLibravatar Andreas Schwab1-1/+1
2016-09-07t6026-merge-attr: clean up background process at end of test caseLibravatar Johannes Sixt1-0/+2
2016-09-02Git 2.10Libravatar Junio C Hamano2-1/+6
2016-09-02Merge tag 'l10n-2.10.0-rnd2.2' of git://github.com/git-l10n/git-poLibravatar Junio C Hamano1-374/+317
2016-09-02Merge branch 'master' of https://github.com/vnwildman/gitLibravatar Jiang Xin1-374/+317
2016-08-31A few more fixes before the final 2.10Libravatar Junio C Hamano1-3/+8
2016-08-31Merge tag 'l10n-2.10.0-rnd2' of git://github.com/git-l10n/git-poLibravatar Junio C Hamano8-14691/+24337
2016-08-31Merge branch 'ls/packet-line-protocol-doc-fix'Libravatar Junio C Hamano1-3/+3
2016-08-31Merge branch 'mh/blame-worktree'Libravatar Junio C Hamano2-1/+7
2016-08-31Merge branch 'kw/patch-ids-optim'Libravatar Junio C Hamano1-0/+0
2016-08-30pack-protocol: fix maximum pkt-line sizeLibravatar Lars Schneider1-3/+3
2016-08-31l10n: zh_CN: for git v2.10.0 l10n round 2Libravatar Jiang Xin1-1755/+2746
2016-08-29p3400: make test script executableLibravatar René Scharfe1-0/+0
2016-08-29blame: fix segfault on untracked filesLibravatar Thomas Gummerer2-1/+7
2016-08-28l10n: ca.po: update translationLibravatar Alex Henrie1-2262/+3751
2016-08-28l10n: fr.po v2.10.0-rc2Libravatar Jean-Noel Avila1-1796/+3072
2016-08-28l10n: Updated Vietnamese translation for v2.10.0-rc2 (2757t)Libravatar Tran Ngoc Quan1-374/+317
2016-08-27l10n: sv.po: Update Swedish translation (2757t0f0u)Libravatar Peter Krefting1-1791/+3043
2016-08-27Merge branch 'master' of https://github.com/vnwildman/gitLibravatar Jiang Xin1-1780/+3085
2016-08-27l10n: git.pot: v2.10.0 round 2 (12 new, 44 removed)Libravatar Jiang Xin1-342/+189
2016-08-27Merge branch 'master' of git://github.com/git-l10n/git-poLibravatar Jiang Xin3-5296/+8782
2016-08-27l10n: Updated Vietnamese translation for v2.10.0 (2789t)Libravatar Tran Ngoc Quan1-1780/+3085
2016-08-26Git 2.10-rc2Libravatar Junio C Hamano2-1/+4
2016-08-26gitattributes: Document the unified "auto" handlingLibravatar Torsten Bögershausen1-34/+24
2016-08-25Prepare for 2.10.0-rc2Libravatar Junio C Hamano1-2/+29
2016-08-25Merge branch 'ja/i18n'Libravatar Junio C Hamano3-71/+20
2016-08-25Merge branch 'bw/mingw-avoid-inheriting-fd-to-lockfile'Libravatar Junio C Hamano6-1/+35
2016-08-25Merge branch 'dg/document-git-c-in-git-config-doc'Libravatar Junio C Hamano1-0/+3
2016-08-25Merge branch 'js/no-html-bypass-on-windows'Libravatar Junio C Hamano3-52/+0
2016-08-25Merge branch 'hv/doc-commit-reference-style'Libravatar Junio C Hamano1-0/+5
2016-08-25git ls-files: text=auto eol=lf is supported in Git 2.10Libravatar Torsten Bögershausen1-2/+1
2016-08-25l10n: pt_PT: update Portuguese translationLibravatar Vasco Almeida1-428/+507
2016-08-25l10n: pt_PT: merge git.potLibravatar Vasco Almeida1-1793/+3017
2016-08-24i18n: simplify numeric error reportingLibravatar Jean-Noel Avila1-28/+16
2016-08-24i18n: fix git rebase interactive commit messagesLibravatar Jean-Noel Avila1-42/+3
2016-08-24i18n: fix typos for translationLibravatar Jean-Noel Avila1-1/+1
2016-08-23doc: mention `git -c` in git-config(1)Libravatar David Glasser1-0/+3
2016-08-23mingw: ensure temporary file handles are not inherited by child processesLibravatar Ben Wijen6-2/+23
2016-08-22l10n: ko.po: Update Korean translationLibravatar Changwoo Ryu1-1757/+2908
2016-08-19Git 2.10-rc1Libravatar Junio C Hamano2-1/+32
2016-08-19Merge branch 'lt/gpg-show-long-key-in-signature-verification'Libravatar Junio C Hamano1-0/+1
2016-08-19Merge branch 'ab/hooks'Libravatar Junio C Hamano3-4/+9
2016-08-19Merge branch 'jk/difftool-command-not-found'Libravatar Junio C Hamano2-0/+13
2016-08-19Merge branch 'sb/checkout-explit-detach-no-advice'Libravatar Junio C Hamano2-1/+25
2016-08-19Merge branch 'tb/t0027-raciness-fix'Libravatar Junio C Hamano2-43/+60
2016-08-19Merge branch 'rs/pull-signed-tag'Libravatar Junio C Hamano4-12/+33
2016-08-19Revert "display HTML in default browser using Windows' shell API"Libravatar Johannes Schindelin3-52/+0
2016-08-18t6026-merge-attr: child processes must not inherit index.lock handlesLibravatar Ben Wijen1-0/+13