Merge branch 'en/checkout-mismerge-fix'

Junio C Hamano committed about 7 years ago

Merge branch 'sg/diff-indent-heuristic-non-experimental'

Junio C Hamano committed about 7 years ago

Merge branch 'ds/feature-macros'

Junio C Hamano committed about 7 years ago

Merge branch 'jk/eoo'

Junio C Hamano committed about 7 years ago

Merge branch 'jk/repo-init-cleanup'

Junio C Hamano committed about 7 years ago

Merge branch 'py/git-gui-do-quit'

Junio C Hamano committed about 7 years ago

grep: skip UTF8 checks explicitly

Carlo Marcelo Arenas Belón committed about 7 years ago

log-tree: call load_ref_decorations() in get_name_decoration()

René Scharfe committed about 7 years ago

log: test --decorate-refs-exclude with --simplify-by-decoration

René Scharfe committed about 7 years ago

gitweb.conf.txt: switch pluses to backticks to help Asciidoctor

Martin Ågren committed about 7 years ago

git-merge-index.txt: wrap shell listing in "----"

Martin Ågren committed about 7 years ago

git-receive-pack.txt: wrap shell [script] listing in "----"

Martin Ågren committed about 7 years ago

git-ls-remote.txt: wrap shell listing in "----"

Martin Ågren committed about 7 years ago

Documentation: wrap config listings in "----"

Martin Ågren committed about 7 years ago

git-merge-base.txt: render indentations correctly under Asciidoctor

Martin Ågren committed about 7 years ago

Documentation: wrap blocks with "--"

Martin Ågren committed about 7 years ago

commit-graph: turn off save_commit_buffer

Jeff King committed about 7 years ago

commit-graph: don't show progress percentages while expanding reachable commits

SZEDER Gábor committed about 7 years ago

commit-graph.c: handle corrupt/missing trees

Taylor Blau committed about 7 years ago

commit-graph.c: handle commit parsing errors

Taylor Blau committed about 7 years ago