merge: fix NULL pointer dereference when merging nothing into void

Junio C Hamano committed over 10 years ago

Documentation: fix git-p4 AsciiDoc formatting

Lars Schneider committed over 10 years ago

git_config_push_parameter: handle empty GIT_CONFIG_PARAMETERS

Jeff King committed over 10 years ago

mingw: skip some tests in t9115 due to file name issues

Johannes Schindelin committed over 10 years ago

t1300: fix the new --show-origin tests on Windows

Johannes Schindelin committed over 10 years ago

t1300-repo-config: make it resilient to being run via 'sh -x'

Johannes Schindelin committed over 10 years ago

config --show-origin: report paths with forward slashes

Johannes Schindelin committed over 10 years ago

Merge branch 'master' of https://github.com/vnwildman/git

Jiang Xin committed over 10 years ago

Merge branch 'master' of git://github.com/alexhenrie/git-po

Jiang Xin committed over 10 years ago

submodule: fix regression for deinit without submodules

Stefan Beller committed over 10 years ago

tag: add the option to force signing of annotated tags

Laurent Arnoud committed over 10 years ago

apply: remove unused call to free() in gitdiff_{old,new}name()

Junio C Hamano committed over 10 years ago

builtin/apply: get rid of useless 'name' variable

Christian Couder committed over 10 years ago

l10n: pt_PT: Update and add new translations

Vasco Almeida committed over 10 years ago

l10n: ca.po: update translation

Alex Henrie committed over 10 years ago

commit: do not lose SQUASH_MSG contents

Sven Strickroth committed over 10 years ago

Git 2.8-rc4

Junio C Hamano committed over 10 years ago

Sync with maint

Junio C Hamano committed over 10 years ago

Merge branch 'mm/doc-hooks-linkgit-fix' into maint

Junio C Hamano committed over 10 years ago

Documentation: fix broken linkgit to git-config

Matthieu Moy committed over 10 years ago