summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2018-06-18Merge tag 'l10n-2.18.0-rnd3' of git://github.com/git-l10n/git-poJunio C Hamano
2018-06-18A bunch of micro-fixes before going 2.18 finalJunio C Hamano
2018-06-18Merge branch 'sb/blame-color'Junio C Hamano
2018-06-18Merge branch 'mw/doc-merge-enumfix'Junio C Hamano
2018-06-18Merge branch 'en/rename-directory-detection'Junio C Hamano
2018-06-18Merge branch 'rd/doc-remote-tracking-with-hyphen'Junio C Hamano
2018-06-18Merge branch 'jl/zlib-restore-nul-termination'Junio C Hamano
2018-06-18Merge branch 'ab/cred-netrc-no-autodie'Junio C Hamano
2018-06-18Merge branch 'km/doc-workflows-typofix'Junio C Hamano
2018-06-18Merge branch 'ld/git-p4-updates'Junio C Hamano
2018-06-18Merge branch 'rd/diff-options-typofix'Junio C Hamano
2018-06-18Merge branch 'rd/comment-typofix-in-sha1-file'Junio C Hamano
2018-06-18RelNotes 2.18: minor fix to entry about dynamically loading completionsSZEDER Gábor
2018-06-18l10n: zh_CN: for git v2.18.0 l10n round 1 to 3Jiang Xin
2018-06-17Merge branch 'master' of git://github.com/nafmo/git-l10n-svJiang Xin
2018-06-17Merge branch 'master' of https://github.com/vnwildman/gitJiang Xin
2018-06-17Merge branch 'master' of git://github.com/alshopov/git-poJiang Xin
2018-06-17Merge branch 'fr_2.18_rnd3' of git://github.com/jnavila/gitJiang Xin
2018-06-17l10n: bg.po: Updated Bulgarian translation (3608t)Alexander Shopov
2018-06-17l10n: vi.po(3608t): Update Vietnamese translation for v2.18.0 round 3Tran Ngoc Quan
2018-06-16l10n: fr.po v2.18.0 round 3Jean-Noël Avila
2018-06-16l10n: es.po: Spanish update for v2.18.0 round 3Christopher Diaz Riveros
2018-06-16l10n: git.pot: v2.18.0 round 3 (1 new, 1 removed)Jiang Xin
2018-06-16Merge branch 'master' of git://github.com/git-l10n/git-poJiang Xin
2018-06-15Merge branch 'master' of https://github.com/vnwildman/gitJiang Xin
2018-06-14doc: update the order of the syntax `git merge --continue`Meng-Sung Wu
2018-06-14blame: release string_list after use in parse_color_fields()René Scharfe
2018-06-14merge-recursive: use xstrdup() instead of fixed bufferRené Scharfe
2018-06-14l10n: vi.po(3608t): Update Vietnamese translation for v2.18.0 round2Tran Ngoc Quan
2018-06-13Git 2.18-rc2v2.18.0-rc2Junio C Hamano
2018-06-13Merge branch 'jk/index-pack-maint'Junio C Hamano
2018-06-13Merge branch 'sg/completion-zsh-workaround'Junio C Hamano
2018-06-13Merge branch 'sb/submodule-merge-in-merge-recursive'Junio C Hamano
2018-06-13Merge branch 'jk/submodule-fsck-loose-fixup'Junio C Hamano
2018-06-13packfile: correct zlib buffer handlingJeremy Linton
2018-06-13RelNotes 2.18: clarify where directory rename detection appliesElijah Newren
2018-06-13Use hyphenated "remote-tracking branch" (docs and comments)Robert P. J. Day
2018-06-13git-credential-netrc: remove use of "autodie"Ævar Arnfjörð Bjarmason
2018-06-12git-p4: auto-size the blockLuke Diamand
2018-06-12git-p4: narrow the scope of exceptions caught when parsing an intLuke Diamand
2018-06-12git-p4: raise exceptions from p4CmdList based on error from p4 serverLuke Diamand
2018-06-12git-p4: better error reporting when p4 failsLuke Diamand
2018-06-12git-p4: add option to disable syncing of p4/master with p4Luke Diamand
2018-06-12git-p4: disable-rebase: allow setting this via configurationLuke Diamand
2018-06-12git-p4: add options --commit and --disable-rebaseRomain Merland
2018-06-12gitworkflows: fix grammar in 'Merge upwards' ruleKyle Meyer
2018-06-12completion: correct zsh detection when run from git-completion.zshSZEDER Gábor
2018-06-12l10n: bg.po: Updated Bulgarian translation (3608t)Alexander Shopov
2018-06-11index-pack: correct install_packed_git() argsJunio C Hamano
2018-06-11diff-options.txt: fix minor typos, font inconsistencies, in docsRobert P. J. Day