Merge branch 'da/mergetools-meld-output-opt-on-macos' into maint

Junio C Hamano committed about 9 years ago

Merge branch 'jk/diff-highlight-module' into maint

Junio C Hamano committed about 9 years ago

Sixteenth batch for 2.14

Junio C Hamano committed about 9 years ago

Merge branch 'jk/reflog-walk-maint'

Junio C Hamano committed about 9 years ago

Merge branch 'bb/unicode-10.0'

Junio C Hamano committed about 9 years ago

Merge branch 'ks/typofix-commit-c-comment'

Junio C Hamano committed about 9 years ago

Merge branch 'ab/wildmatch'

Junio C Hamano committed about 9 years ago

Merge branch 'ab/sha1dc'

Junio C Hamano committed about 9 years ago

Merge branch 'rs/free-and-null'

Junio C Hamano committed about 9 years ago

Merge branch 'pw/unquote-path-in-git-pm'

Junio C Hamano committed about 9 years ago

Merge branch 'ks/commit-assuming-only-warning-removal'

Junio C Hamano committed about 9 years ago

ref-filter.c: drop return from void function

Alejandro R. Sedeño committed about 9 years ago

l10n: de.po: fix typo

Ralf Thielow committed about 9 years ago

Makefile: disable unaligned loads with UBSan

Jeff King committed about 9 years ago

Makefile: turn off -fomit-frame-pointer with sanitizers

Jeff King committed about 9 years ago

Makefile: add helper for compiling with -fsanitize

Jeff King committed about 9 years ago

test-lib: turn on ASan abort_on_error by default

Jeff King committed about 9 years ago

test-lib: set ASAN_OPTIONS variable before we run git

Jeff King committed about 9 years ago

doc: correct a mistake in an illustration

Kaartic Sivaraam committed about 9 years ago

wt-status: use separate variable for result of shorten_unambiguous_ref

René Scharfe committed about 9 years ago