fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variable

SZEDER Gábor committed over 18 years ago

add 'merge.stat' config variable

SZEDER Gábor committed over 18 years ago

merge, pull: introduce '--(no-)stat' option

SZEDER Gábor committed over 18 years ago

doc: moved merge.* config variables into separate merge-config.txt

SZEDER Gábor committed over 18 years ago

Merge branch 'maint'

Junio C Hamano committed over 18 years ago

t7401: squelch garbage output

Junio C Hamano committed over 18 years ago

git_config_bool_or_int()

Junio C Hamano committed over 18 years ago

Documentation/git-submodule: typofix

Junio C Hamano committed over 18 years ago

Fix config key miscount in url.*.insteadOf

Daniel Barkalow committed over 18 years ago

Merge branch 'maint-1.5.4' into maint

Junio C Hamano committed over 18 years ago

Docs gitk: Explicitly mention the files that gitk uses (~/.gitk)

Clifford Caoile committed over 18 years ago

Document -w option to shortlog

Junio C Hamano committed over 18 years ago

bisect: report bad rev better

Christian Couder committed over 18 years ago

Merge branch 'maint'

Junio C Hamano committed over 18 years ago

Merge branch 'maint-1.5.4' into maint

Junio C Hamano committed over 18 years ago

bisect: fix bad rev checking in "git bisect good"

Christian Couder committed over 18 years ago

bisect: add "git bisect help" subcommand to get a long usage string

Christian Couder committed over 18 years ago

builtin-commit.c: Remove a redundant assignment.

Johannes Sixt committed over 18 years ago

revision.c: make --date-order overriddable

Michele Ballabio committed over 18 years ago

git-submodule: Avoid 'fatal: cannot describe' message

Ping Yin committed over 18 years ago