Merge branch 'maint'

Junio C Hamano committed over 14 years ago

Update draft release notes to 1.7.10.2

Junio C Hamano committed over 14 years ago

Merge branch 'mm/include-userpath' into maint

Junio C Hamano committed over 14 years ago

Merge branch 'cc/fix-missing-va-end-in-revert' into maint

Junio C Hamano committed over 14 years ago

Merge branch 'bw/test-fix-grep-gnuism' into maint

Junio C Hamano committed over 14 years ago

Merge branch 'jk/http-backend-keep-committer-ident-env' into maint

Junio C Hamano committed over 14 years ago

Merge branch 'nl/rebase-i-cheat-sheet' into maint

Junio C Hamano committed over 14 years ago

Merge branch 'bw/submodule-sed-solaris' into maint

Junio C Hamano committed over 14 years ago

Merge branch 'jk/maint-push-progress' into maint

Junio C Hamano committed over 14 years ago

Merge branch 'jc/rerere-train' into maint

Junio C Hamano committed over 14 years ago

Merge branch 'lp/diffstat-with-graph' into maint

Junio C Hamano committed over 14 years ago

tests: add tests for the bash prompt functions in the completion script

SZEDER Gábor committed over 14 years ago

tests: move code to run tests under bash into a helper library

SZEDER Gábor committed over 14 years ago

xdiff: remove unused functions

René Scharfe committed over 14 years ago

xdiff: remove emit_func() and xdi_diff_hunks()

René Scharfe committed over 14 years ago

blame: factor out helper for calling xdi_diff()

René Scharfe committed over 14 years ago

blame: use hunk_func(), part 2

René Scharfe committed over 14 years ago

blame: use hunk_func(), part 1

René Scharfe committed over 14 years ago

xdiff: add hunk_func()

René Scharfe committed over 14 years ago

Merge branch 'maint' into master

Ralf Thielow committed over 14 years ago