summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2016-11-29Merge branch 'cp/completion-negative-refs' into maintLibravatar Junio C Hamano1-3/+4
2016-11-29Merge branch 'jc/am-read-author-file' into maintLibravatar Junio C Hamano1-58/+45
2016-11-29Git 2.11Libravatar Junio C Hamano2-1/+6
2016-11-29Merge branch 'jk/common-main'Libravatar Junio C Hamano4-9/+10
2016-11-29Merge tag 'l10n-2.11.0-rnd3.1' of git://github.com/git-l10n/git-poLibravatar Junio C Hamano2-4189/+5888
2016-11-29common-main: stop munging argv[0] pathLibravatar Jeff King4-9/+10
2016-11-29t7610: clean up foo.XXXXXX tmpdirLibravatar Jeff King1-1/+2
2016-11-29mergetools/vimdiff: trust Vim's exit codeLibravatar David Aguilar1-0/+4
2016-11-29mergetool: honor mergetool.$tool.trustExitCode for built-in toolsLibravatar David Aguilar20-38/+71
2016-11-29Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ruLibravatar Jiang Xin1-2066/+2868
2016-11-29l10n: ru.po: update Russian translationLibravatar Dimitriy Ryazantcev1-2066/+2868
2016-11-28l10n: ca.po: update translationLibravatar Alex Henrie1-2123/+3020
2016-11-28RelNotes: spelling and phrasing fixupsLibravatar Marc Branchaud1-76/+72
2016-11-28merge-recursive.c: use string_list_sort instead of qsortLibravatar Nguyễn Thái Ngọc Duy1-9/+7
2016-11-28Merge tag 'l10n-2.11.0-rnd3' of git://github.com/git-l10n/git-poLibravatar Junio C Hamano8-2193/+3167
2016-11-28worktree list: keep the list sortedLibravatar Nguyễn Thái Ngọc Duy4-1/+36
2016-11-28worktree.c: get_worktrees() takes a new flag argumentLibravatar Nguyễn Thái Ngọc Duy5-8/+8
2016-11-28get_worktrees() must return main worktree as first item even on errorLibravatar Nguyễn Thái Ngọc Duy3-9/+28
2016-11-28worktree: reorder an if statementLibravatar Nguyễn Thái Ngọc Duy1-3/+3
2016-11-28merge-recursive: handle NULL in add_cacheinfo() correctlyLibravatar Johannes Schindelin2-1/+3
2016-11-28cherry-pick: demonstrate a segmentation faultLibravatar Johannes Schindelin1-0/+12
2016-11-28l10n: de.po: translate 210 new messagesLibravatar Ralf Thielow1-2111/+3085
2016-11-25l10n: fix unmatched single quote in error messageLibravatar Jiang Xin7-82/+82
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-23worktree.c: zero new 'struct worktree' on allocationLibravatar Nguyễn Thái Ngọc Duy1-12/+2
2016-11-23push: fix --dry-run to not push submodulesLibravatar Brandon Williams4-10/+18
2016-11-23push: --dry-run updates submodules when --recurse-submodules=on-demandLibravatar Brandon Williams1-0/+24
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-18upload-pack: optionally allow fetching any sha1Libravatar David Turner4-4/+39
2016-11-18remote-curl: don't hang when a server dies before any outputLibravatar David Turner2-0/+38
2016-11-17submodules: allow empty working-tree dirs in merge/cherry-pickLibravatar David Turner3-11/+17
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