Merge branch 'ao/path-use-xmalloc'

Junio C Hamano committed almost 9 years ago

Merge branch 'np/config-path-doc'

Junio C Hamano committed almost 9 years ago

xdiff: reassign xpparm_t.flags bits

Junio C Hamano committed almost 9 years ago

docs: fix formatting of rev-parse's --show-superproject-working-tree

Sebastian Schuberth committed almost 9 years ago

rev-list-options.txt: use correct directional reference

SZEDER Gábor committed almost 9 years ago

t1409: check that `packed-refs` is not rewritten unnecessarily

Michael Haggerty committed almost 9 years ago

stash: remove now superfluos help for "stash push"

Thomas Gummerer committed almost 9 years ago

stash: mark "git stash save" deprecated in the man page

Thomas Gummerer committed almost 9 years ago

stash: replace "git stash save" with "git stash push" in the documentation

Thomas Gummerer committed almost 9 years ago

Merge branch 'mh/ref-locking-fix'

Junio C Hamano committed almost 9 years ago

status: do not get confused by submodules in excluded directories

Johannes Schindelin committed almost 9 years ago

diff.c: get rid of duplicate implementation

Stefan Beller committed almost 9 years ago

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