Merge branch 'cp/completion-negative-refs' into maint

Junio C Hamano committed almost 10 years ago

Merge branch 'jc/am-read-author-file' into maint

Junio C Hamano committed almost 10 years ago

Git 2.11

Junio C Hamano committed almost 10 years ago

Merge branch 'jk/common-main'

Junio C Hamano committed almost 10 years ago

Merge tag 'l10n-2.11.0-rnd3.1' of git://github.com/git-l10n/git-po

Junio C Hamano committed almost 10 years ago

common-main: stop munging argv[0] path

Jeff King committed almost 10 years ago

t7610: clean up foo.XXXXXX tmpdir

Jeff King committed almost 10 years ago

git-p4: allow submit to create shelved changelists.

Vinicius Kursancew committed almost 10 years ago

mergetools/vimdiff: trust Vim's exit code

David Aguilar committed almost 10 years ago

mergetool: honor mergetool.$tool.trustExitCode for built-in tools

David Aguilar committed almost 10 years ago

Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ru

Jiang Xin committed almost 10 years ago

l10n: ru.po: update Russian translation

Dimitriy Ryazantcev committed almost 10 years ago

l10n: ca.po: update translation

Alex Henrie committed almost 10 years ago

RelNotes: spelling and phrasing fixups

Marc Branchaud committed almost 10 years ago

merge-recursive.c: use string_list_sort instead of qsort

Nguyễn Thái Ngọc Duy committed almost 10 years ago

Merge tag 'l10n-2.11.0-rnd3' of git://github.com/git-l10n/git-po

Junio C Hamano committed almost 10 years ago

worktree list: keep the list sorted

Nguyễn Thái Ngọc Duy committed almost 10 years ago

worktree.c: get_worktrees() takes a new flag argument

Nguyễn Thái Ngọc Duy committed almost 10 years ago

get_worktrees() must return main worktree as first item even on error

Nguyễn Thái Ngọc Duy committed almost 10 years ago

worktree: reorder an if statement

Nguyễn Thái Ngọc Duy committed almost 10 years ago