Merge branch 'jl/interrupt-clone-remove-separate-git-dir'

Junio C Hamano committed almost 14 years ago

Merge branch 'as/dir-c-cleanup'

Junio C Hamano committed almost 14 years ago

Merge branch 'jk/config-uname'

Junio C Hamano committed almost 14 years ago

Merge branch 'nd/wildmatch'

Junio C Hamano committed almost 14 years ago

Merge branch 'tb/test-shell-lint'

Junio C Hamano committed almost 14 years ago

Merge branch 'mz/pick-unborn'

Junio C Hamano committed almost 14 years ago

Merge branch 'aw/rebase-am-failure-detection'

Junio C Hamano committed almost 14 years ago

Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit'

Junio C Hamano committed almost 14 years ago

log --use-mailmap: optimize for cases without --author/--committer search

Junio C Hamano committed almost 14 years ago

log: add log.mailmap configuration option

Antoine Pelisse committed almost 14 years ago

log: grep author/committer using mailmap

Antoine Pelisse committed almost 14 years ago

test: add test for --use-mailmap option

Antoine Pelisse committed almost 14 years ago

log: add --use-mailmap option

Antoine Pelisse committed almost 14 years ago

pretty: use mailmap to display username and email

Antoine Pelisse committed almost 14 years ago

mailmap: add mailmap structure to rev_info and pp

Antoine Pelisse committed almost 14 years ago

mailmap: simplify map_user() interface

Antoine Pelisse committed almost 14 years ago

mailmap: remove email copy and length limitation

Junio C Hamano committed almost 14 years ago

commit: make default of "cleanup" option configurable

Ralf Thielow committed almost 14 years ago

git-commit-tree(1): correct description of defaults

Peter Eisentraut committed almost 14 years ago

git-fast-import(1): reorganise options

John Keeping committed almost 14 years ago