summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2018-06-18Merge tag 'l10n-2.18.0-rnd3' of git://github.com/git-l10n/git-poLibravatar Junio C Hamano10-17929/+26095
2018-06-18A bunch of micro-fixes before going 2.18 finalLibravatar Junio C Hamano1-0/+11
2018-06-18Merge branch 'sb/blame-color'Libravatar Junio C Hamano1-0/+1
2018-06-18Merge branch 'mw/doc-merge-enumfix'Libravatar Junio C Hamano1-1/+1
2018-06-18Merge branch 'en/rename-directory-detection'Libravatar Junio C Hamano1-5/+5
2018-06-18Merge branch 'rd/doc-remote-tracking-with-hyphen'Libravatar Junio C Hamano3-5/+5
2018-06-18Merge branch 'jl/zlib-restore-nul-termination'Libravatar Junio C Hamano1-0/+3
2018-06-18Merge branch 'ab/cred-netrc-no-autodie'Libravatar Junio C Hamano1-1/+0
2018-06-18Merge branch 'km/doc-workflows-typofix'Libravatar Junio C Hamano1-1/+1
2018-06-18Merge branch 'ld/git-p4-updates'Libravatar Junio C Hamano5-24/+307
2018-06-18Merge branch 'rd/diff-options-typofix'Libravatar Junio C Hamano1-4/+4
2018-06-18Merge branch 'rd/comment-typofix-in-sha1-file'Libravatar Junio C Hamano1-1/+1
2018-06-18RelNotes 2.18: minor fix to entry about dynamically loading completionsLibravatar SZEDER Gábor1-1/+1
2018-06-18l10n: zh_CN: for git v2.18.0 l10n round 1 to 3Libravatar Jiang Xin1-2452/+3552
2018-06-17Merge branch 'master' of git://github.com/nafmo/git-l10n-svLibravatar Jiang Xin1-2453/+3562
2018-06-17Merge branch 'master' of https://github.com/vnwildman/gitLibravatar Jiang Xin1-21/+21
2018-06-17Merge branch 'master' of git://github.com/alshopov/git-poLibravatar Jiang Xin1-19/+19
2018-06-17Merge branch 'fr_2.18_rnd3' of git://github.com/jnavila/gitLibravatar Jiang Xin1-466/+1071
2018-06-17l10n: bg.po: Updated Bulgarian translation (3608t)Libravatar Alexander Shopov1-19/+19
2018-06-17l10n: vi.po(3608t): Update Vietnamese translation for v2.18.0 round 3Libravatar Tran Ngoc Quan1-21/+21
2018-06-16l10n: fr.po v2.18.0 round 3Libravatar Jean-Noël Avila1-466/+1071
2018-06-16l10n: es.po: Spanish update for v2.18.0 round 3Libravatar Christopher Diaz Riveros1-20/+20
2018-06-16l10n: git.pot: v2.18.0 round 3 (1 new, 1 removed)Libravatar Jiang Xin1-17/+17
2018-06-16Merge branch 'master' of git://github.com/git-l10n/git-poLibravatar Jiang Xin8-12862/+18214
2018-06-15Merge branch 'master' of https://github.com/vnwildman/gitLibravatar Jiang Xin1-430/+994
2018-06-14doc: update the order of the syntax `git merge --continue`Libravatar Meng-Sung Wu1-1/+1
2018-06-14blame: release string_list after use in parse_color_fields()Libravatar René Scharfe1-0/+1
2018-06-14merge-recursive: use xstrdup() instead of fixed bufferLibravatar René Scharfe1-5/+5
2018-06-14l10n: vi.po(3608t): Update Vietnamese translation for v2.18.0 round2Libravatar Tran Ngoc Quan1-430/+994
2018-06-13Git 2.18-rc2Libravatar Junio C Hamano2-1/+7
2018-06-13Merge branch 'jk/index-pack-maint'Libravatar Junio C Hamano4-2/+25
2018-06-13Merge branch 'sg/completion-zsh-workaround'Libravatar Junio C Hamano2-2/+5
2018-06-13Merge branch 'sb/submodule-merge-in-merge-recursive'Libravatar Junio C Hamano1-2/+2
2018-06-13Merge branch 'jk/submodule-fsck-loose-fixup'Libravatar Junio C Hamano2-8/+24
2018-06-13packfile: correct zlib buffer handlingLibravatar Jeremy Linton1-0/+3
2018-06-13RelNotes 2.18: clarify where directory rename detection appliesLibravatar Elijah Newren1-1/+1
2018-06-13Use hyphenated "remote-tracking branch" (docs and comments)Libravatar Robert P. J. Day3-5/+5
2018-06-13git-credential-netrc: remove use of "autodie"Libravatar Ævar Arnfjörð Bjarmason1-1/+0
2018-06-12git-p4: auto-size the blockLibravatar Luke Diamand2-6/+29
2018-06-12git-p4: narrow the scope of exceptions caught when parsing an intLibravatar Luke Diamand1-1/+1
2018-06-12git-p4: raise exceptions from p4CmdList based on error from p4 serverLibravatar Luke Diamand1-4/+40
2018-06-12git-p4: better error reporting when p4 failsLibravatar Luke Diamand2-0/+133
2018-06-12git-p4: add option to disable syncing of p4/master with p4Libravatar Luke Diamand2-11/+28
2018-06-12git-p4: disable-rebase: allow setting this via configurationLibravatar Luke Diamand2-2/+5
2018-06-12git-p4: add options --commit and --disable-rebaseLibravatar Romain Merland3-6/+77
2018-06-12gitworkflows: fix grammar in 'Merge upwards' ruleLibravatar Kyle Meyer1-1/+1
2018-06-12completion: correct zsh detection when run from git-completion.zshLibravatar SZEDER Gábor2-2/+5
2018-06-12l10n: bg.po: Updated Bulgarian translation (3608t)Libravatar Alexander Shopov1-2463/+3598
2018-06-11index-pack: correct install_packed_git() argsLibravatar Junio C Hamano1-1/+1
2018-06-11diff-options.txt: fix minor typos, font inconsistencies, in docsLibravatar Robert P. J. Day1-4/+4