Merge branch 'jh/fsck-promisors'

Junio C Hamano committed over 8 years ago

Merge branch 'ma/skip-writing-unchanged-index'

Junio C Hamano committed over 8 years ago

Merge branch 'ma/config-page-only-in-list-mode'

Junio C Hamano committed over 8 years ago

diff-highlight: detect --graph by indent

Jeff King committed over 8 years ago

diff-highlight: use flush() helper consistently

Jeff King committed over 8 years ago

diff-highlight: test graphs with --color

Jeff King committed over 8 years ago

diff-highlight: test interleaved parallel lines of history

Jeff King committed over 8 years ago

diff-highlight: prefer "echo" to "cat" in tests

Jeff King committed over 8 years ago

diff-highlight: use test_tick in graph test

Jeff King committed over 8 years ago

diff-highlight: correct test graph diagram

Jeff King committed over 8 years ago

Merge branch 'master' of git://github.com/nafmo/git-l10n-sv

Jiang Xin committed over 8 years ago

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

Jiang Xin committed over 8 years ago

rebase --root: stop assuming squash_onto is unset

Phillip Wood committed over 8 years ago

doc/gitattributes: mention non-recursive behavior

Jeff King committed over 8 years ago

read-cache: fix an -Wmaybe-uninitialized warning

Ramsay Jones committed over 8 years ago

-Wuninitialized: remove some 'init-self' workarounds

Ramsay Jones committed over 8 years ago

stash push -u: don't create empty stash

Thomas Gummerer committed over 8 years ago

stash push: avoid printing errors

Thomas Gummerer committed over 8 years ago

stash: fix nonsense pipeline

Junio C Hamano committed over 8 years ago

filter-branch: use printf instead of echo -e

Michele Locati committed over 8 years ago