summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* t7800: replace "wc -l" with test_line_countda/t7800-cleanupDavid Aguilar2017-02-081-12/+19
* Merge branch 'da/difftool-dir-diff-fix' into da/t7800-cleanupJunio C Hamano2017-02-082-3/+45
|\
| * difftool: fix dir-diff index creation when in a subdirectoryda/difftool-dir-diff-fixDavid Aguilar2016-12-082-3/+45
* | t7800: simplify basic usage testDavid Aguilar2017-02-081-8/+7
* | difftool: fix bug when printing usageDavid Aguilar2017-02-062-4/+17
* | difftool: hack around -Wzero-length-format warningJeff King2017-01-251-1/+1
* | difftool: retire the scripted versionJohannes Schindelin2017-01-196-97/+47
* | difftool: implement the functionality in the builtinJohannes Schindelin2017-01-191-1/+671
* | difftool: add a skeleton for the upcoming builtinJohannes Schindelin2017-01-177-1/+75
* | Git 2.11-rc3v2.11.0-rc3Junio C Hamano2016-11-232-1/+10
* | Merge branch 'jc/setup-cleanup-fix'Junio C Hamano2016-11-238-20/+69
|\ \
| * | archive: read local configurationjc/setup-cleanup-fixJunio C Hamano2016-11-226-15/+40
| * | mailinfo: read local configurationJunio C Hamano2016-11-223-5/+29
* | | Merge branch 'jt/trailer-with-cruft'Junio C Hamano2016-11-231-1/+2
|\ \ \
| * | | doc: mention user-configured trailersjt/trailer-with-cruftJonathan Tan2016-11-211-1/+2
* | | | Merge branch 'js/rebase-i-commentchar-fix'Junio C Hamano2016-11-234-3/+34
|\ \ \ \
| * | | | rebase -i: handle core.commentChar=autojs/rebase-i-commentchar-fixJohannes Schindelin2016-11-212-3/+12
| * | | | stripspace: respect repository configJohannes Schindelin2016-11-212-2/+4
| * | | | rebase -i: highlight problems with core.commentcharJohannes Schindelin2016-11-212-0/+20
* | | | | Merge branch 'jc/for-each-ref-head-segfault-fix'Junio C Hamano2016-11-232-1/+11
|\ \ \ \ \
| * | | | | for-each-ref: do not segv with %(HEAD) on an unborn branchjc/for-each-ref-head-segfault-fixJunio C Hamano2016-11-182-1/+11
| |/ / / /
* | | | | Merge tag 'l10n-2.11.0-rnd2' of git://github.com/git-l10n/git-poJunio C Hamano2016-11-228-16103/+23112
|\ \ \ \ \
| * | | | | l10n: Fixed typo of git fetch-pack commandJiang Xin2016-11-226-183/+282
| * | | | | l10n: git.pot: v2.11.0 round 2 (1 new, 1 removed)Jiang Xin2016-11-221-9/+9
| * | | | | Merge branch 'master' of git://github.com/git-l10n/git-poJiang Xin2016-11-228-16066/+22976
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | l10n: zh_CN: for git v2.11.0 l10n round 1Jiang Xin2016-11-211-2002/+2897
| | * | | | l10n: pt_PT: update Portuguese translationVasco Almeida2016-11-131-2027/+2947
| | * | | | Merge branch 'fr_v2.11.0_rnd1' of git://github.com/jnavila/gitJiang Xin2016-11-091-2047/+2922
| | |\ \ \ \
| | | * | | | l10n: fr.po fix grammar mistakesjfbu2016-11-061-11/+7
| | | * | | | l10n: fr.po v2.11.0_rnd1Jean-Noel Avila2016-11-051-2037/+2916
| | * | | | | l10n: sv.po: Update Swedish translation (2913t0f0u)Peter Krefting2016-11-051-2019/+2936
| | * | | | | Merge branch 'ko/merge-l10n' of https://github.com/changwoo/git-l10n-koJiang Xin2016-11-051-2230/+2946
| | |\ \ \ \ \
| | | * | | | | l10n: ko.po: Update Korean translationChangwoo Ryu2016-11-041-2230/+2946
| | * | | | | | l10n: vi.po: Updated translation to v2.11.0 (2913t)Tran Ngoc Quan2016-11-041-2016/+2930
| | |/ / / / /
| | * | | | | Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ruJiang Xin2016-11-021-1773/+2656
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | l10n: ru.po: update Russian translationDimitriy Ryazantcev2016-10-161-1773/+2656
| | * | | | | l10n: git.pot: v2.11.0 round 1 (209 new, 53 removed)Jiang Xin2016-11-011-1952/+2742
* | | | | | | Merge branch 'js/prepare-sequencer'Junio C Hamano2016-11-221-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | i18n: fix unmatched single quote in error messagejs/prepare-sequencerJiang Xin2016-11-211-1/+1
* | | | | | | Git 2.11-rc2v2.11.0-rc2Junio C Hamano2016-11-172-1/+4
* | | | | | | Merge branch 'tk/diffcore-delta-remove-unused'Junio C Hamano2016-11-175-8/+1
|\ \ \ \ \ \ \
| * | | | | | | diffcore-delta: remove unused parameter to diffcore_count_changes()tk/diffcore-delta-remove-unusedTobias Klauser2016-11-145-8/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'jk/create-branch-remove-unused-param'Junio C Hamano2016-11-174-13/+18
|\ \ \ \ \ \ \
| * | | | | | | create_branch: drop unused "head" parameterjk/create-branch-remove-unused-paramJeff King2016-11-094-13/+18
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'nd/worktree-lock'Junio C Hamano2016-11-171-1/+1
|\ \ \ \ \ \ \
| * | | | | | | git-worktree.txt: fix typo "to"/"two", and add command/worktree-lockBen North2016-11-131-1/+1
* | | | | | | | Git 2.11.0-rc1v2.11.0-rc1Junio C Hamano2016-11-111-0/+7
* | | | | | | | Merge branch 'rt/fetch-pack-error-message-fix'Junio C Hamano2016-11-111-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | fetch-pack.c: correct command at the beginning of an error messagert/fetch-pack-error-message-fixRalf Thielow2016-11-111-1/+1
* | | | | | | | | Merge branch 'ps/common-info-doc'Junio C Hamano2016-11-111-1/+1
|\ \ \ \ \ \ \ \ \