summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2017-03-15t7800: remove whitespace before redirectLibravatar David Aguilar1-1/+1
2017-02-08t7800: replace "wc -l" with test_line_countLibravatar David Aguilar1-12/+19
2017-02-08Merge branch 'da/difftool-dir-diff-fix' into da/t7800-cleanupLibravatar Junio C Hamano2-3/+45
2017-02-08t7800: simplify basic usage testLibravatar David Aguilar1-8/+7
2017-02-06difftool: fix bug when printing usageLibravatar David Aguilar2-4/+17
2017-01-25difftool: hack around -Wzero-length-format warningLibravatar Jeff King1-1/+1
2017-01-19difftool: retire the scripted versionLibravatar Johannes Schindelin6-97/+47
2017-01-19difftool: implement the functionality in the builtinLibravatar Johannes Schindelin1-1/+671
2017-01-17difftool: add a skeleton for the upcoming builtinLibravatar Johannes Schindelin7-1/+75
2016-12-08difftool: fix dir-diff index creation when in a subdirectoryLibravatar David Aguilar2-3/+45
2016-11-23Git 2.11-rc3Libravatar Junio C Hamano2-1/+10
2016-11-23Merge branch 'jc/setup-cleanup-fix'Libravatar Junio C Hamano8-20/+69
2016-11-23Merge branch 'jt/trailer-with-cruft'Libravatar Junio C Hamano1-1/+2
2016-11-23Merge branch 'js/rebase-i-commentchar-fix'Libravatar Junio C Hamano4-3/+34
2016-11-23Merge branch 'jc/for-each-ref-head-segfault-fix'Libravatar Junio C Hamano2-1/+11
2016-11-22Merge tag 'l10n-2.11.0-rnd2' of git://github.com/git-l10n/git-poLibravatar Junio C Hamano8-16103/+23112
2016-11-22Merge branch 'js/prepare-sequencer'Libravatar Junio C Hamano1-1/+1
2016-11-22archive: read local configurationLibravatar Junio C Hamano6-15/+40
2016-11-22mailinfo: read local configurationLibravatar Junio C Hamano3-5/+29
2016-11-22l10n: Fixed typo of git fetch-pack commandLibravatar Jiang Xin6-183/+282
2016-11-22l10n: git.pot: v2.11.0 round 2 (1 new, 1 removed)Libravatar Jiang Xin1-9/+9
2016-11-22Merge branch 'master' of git://github.com/git-l10n/git-poLibravatar Jiang Xin8-16066/+22976
2016-11-21doc: mention user-configured trailersLibravatar Jonathan Tan1-1/+2
2016-11-21rebase -i: handle core.commentChar=autoLibravatar Johannes Schindelin2-3/+12
2016-11-21stripspace: respect repository configLibravatar Johannes Schindelin2-2/+4
2016-11-21rebase -i: highlight problems with core.commentcharLibravatar Johannes Schindelin2-0/+20
2016-11-21i18n: fix unmatched single quote in error messageLibravatar Jiang Xin1-1/+1
2016-11-21l10n: zh_CN: for git v2.11.0 l10n round 1Libravatar Jiang Xin1-2002/+2897
2016-11-18for-each-ref: do not segv with %(HEAD) on an unborn branchLibravatar Junio C Hamano2-1/+11
2016-11-17Git 2.11-rc2Libravatar Junio C Hamano2-1/+4
2016-11-17Merge branch 'tk/diffcore-delta-remove-unused'Libravatar Junio C Hamano5-8/+1
2016-11-17Merge branch 'jk/create-branch-remove-unused-param'Libravatar Junio C Hamano4-13/+18
2016-11-17Merge branch 'nd/worktree-lock'Libravatar Junio C Hamano1-1/+1
2016-11-14diffcore-delta: remove unused parameter to diffcore_count_changes()Libravatar Tobias Klauser5-8/+1
2016-11-13git-worktree.txt: fix typo "to"/"two", and add commaLibravatar Ben North1-1/+1
2016-11-13l10n: pt_PT: update Portuguese translationLibravatar Vasco Almeida1-2027/+2947
2016-11-11Git 2.11.0-rc1Libravatar Junio C Hamano1-0/+7
2016-11-11Merge branch 'rt/fetch-pack-error-message-fix'Libravatar Junio C Hamano1-1/+1
2016-11-11Merge branch 'ps/common-info-doc'Libravatar Junio C Hamano1-1/+1
2016-11-11Merge branch 'js/pwd-var-vs-pwd-cmd-fix'Libravatar Junio C Hamano2-3/+3
2016-11-11Merge branch 'ls/macos-update'Libravatar Junio C Hamano2-1/+3
2016-11-11Merge branch 'js/prepare-sequencer'Libravatar Junio C Hamano1-1/+1
2016-11-11Merge branch 'ls/filter-process'Libravatar Junio C Hamano1-2/+1
2016-11-11Merge branch 'as/merge-attr-sleep'Libravatar Junio C Hamano1-5/+13
2016-11-11fetch-pack.c: correct command at the beginning of an error messageLibravatar Ralf Thielow1-1/+1
2016-11-11t0021: remove debugging cruftLibravatar Junio C Hamano1-2/+1
2016-11-11t6026: clarify the point of "kill $(cat sleep.pid)"Libravatar Johannes Sixt1-1/+9
2016-11-11t0021, t5615: use $PWD instead of $(pwd) in PATH-like shell variablesLibravatar Johannes Sixt2-3/+3
2016-11-11doc: fix location of 'info/' with $GIT_COMMON_DIRLibravatar Patrick Steinhardt1-1/+1
2016-11-10t6026: ensure that long-running script really isLibravatar Johannes Schindelin1-4/+4