summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2016-11-29trailer: have function to describe trailer layoutLibravatar Jonathan Tan2-36/+107
2016-11-29trailer: avoid unnecessary splitting on linesLibravatar Jonathan Tan1-94/+100
2016-11-29commit: make ignore_non_trailer take buf/lenLibravatar Jonathan Tan4-14/+14
2016-11-29trailer: be stricter in parsing separatorsLibravatar Jonathan Tan1-6/+23
2016-11-29Merge branch 'tk/diffcore-delta-remove-unused' into maintLibravatar Junio C Hamano5-8/+1
2016-11-29Merge branch 'jk/create-branch-remove-unused-param' into maintLibravatar Junio C Hamano4-13/+18
2016-11-29Merge branch 'nd/worktree-lock' into maintLibravatar Junio C Hamano1-1/+1
2016-11-29Merge branch 'ps/common-info-doc' into maintLibravatar Junio C Hamano1-1/+1
2016-11-29Merge branch 'rs/cocci' into maintLibravatar Junio C Hamano1-0/+15
2016-11-29Merge branch 'nd/test-helpers' into maintLibravatar Junio C Hamano2-3/+18
2016-11-29Merge branch 'sc/fmt-merge-msg-doc-markup-fix' into maintLibravatar Junio C Hamano1-2/+2
2016-11-29Merge branch 'rs/commit-pptr-simplify' into maintLibravatar Junio C Hamano1-8/+6
2016-11-29Merge branch 'jk/rebase-config-insn-fmt-docfix' into maintLibravatar Junio C Hamano1-1/+1
2016-11-29Merge branch 'ak/pre-receive-hook-template-modefix' into maintLibravatar Junio C Hamano1-0/+0
2016-11-29Merge branch 'ls/macos-update' into maintLibravatar Junio C Hamano2-1/+3
2016-11-29Merge branch 'as/merge-attr-sleep' into maintLibravatar Junio C Hamano1-5/+13
2016-11-29Merge branch 'ak/sh-setup-dot-source-i18n-fix' into maintLibravatar Junio C Hamano1-3/+3
2016-11-29Merge branch 'jk/daemon-path-ok-check-truncation' into maintLibravatar Junio C Hamano1-4/+21
2016-11-29Merge branch 'rs/ring-buffer-wraparound' into maintLibravatar Junio C Hamano2-2/+4
2016-11-29Merge branch 'mm/send-email-cc-cruft-after-address' into maintLibravatar Junio C Hamano3-10/+42
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-29git-p4: allow submit to create shelved changelists.Libravatar Vinicius Kursancew3-14/+58
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