xdiff-interface: export comparing and hashing strings

Stefan Beller committed almost 9 years ago

path.c: use xmalloc() in add_to_trie()

Andrey Okoshkin committed almost 9 years ago

completion: add remaining flags to checkout

Thomas Braun committed almost 9 years ago

files_transaction_prepare(): fix handling of ref lock failure

Michael Haggerty committed almost 9 years ago

t1404: add a bunch of tests of D/F conflicts

Michael Haggerty committed almost 9 years ago

Merge tag 'l10n-2.15.0-rnd2' of git://github.com/git-l10n/git-po

Junio C Hamano committed almost 9 years ago

Merge branch 'jx/zh_CN-proposed' of github.com:jiangxin/git

Jiang Xin committed almost 9 years ago

l10n: zh_CN: review for git v2.15.0 l10n round 2

Ray Chen committed almost 9 years ago

l10n: zh_CN: for git v2.15.0 l10n round 2

Jiang Xin committed almost 9 years ago

Merge branch 'master' of https://github.com/ralfth/git-po-de

Jiang Xin committed almost 9 years ago

column: do not include pager.c

Junio C Hamano committed almost 9 years ago

gitweb: use filetest to allow ACLs

Guillaume Castagnino committed almost 9 years ago

builtin/push.c: add push.pushOption config

Marius Paliga committed almost 9 years ago

l10n: de.po: fix typos

Andre Hinrichs committed almost 9 years ago

l10n: de.po: translate 70 new messages

Ralf Thielow committed almost 9 years ago

Sync with 2.14.3

Junio C Hamano committed almost 9 years ago

Git 2.14.3

Junio C Hamano committed almost 9 years ago

Merge branch 'jk/info-alternates-fix' into maint

Junio C Hamano committed almost 9 years ago

Merge branch 'jc/fetch-refspec-doc-update' into maint

Junio C Hamano committed almost 9 years ago

Merge branch 'jk/write-in-full-fix' into maint

Junio C Hamano committed almost 9 years ago