Merge branch 'tr/maint-word-diff-regex-sticky'

Junio C Hamano committed over 14 years ago

Merge branch 'jn/diffstat-tests'

Junio C Hamano committed over 14 years ago

Merge branch 'jc/diff-algo-cleanup'

Junio C Hamano committed over 14 years ago

Merge branch 'jc/commit-hook-authorship'

Junio C Hamano committed over 14 years ago

Merge branch 'nd/stream-more'

Junio C Hamano committed over 14 years ago

merge overwrites unstaged changes in renamed file

Clemens Buchacher committed over 14 years ago

i18n: mark @{upstream} error messages for translation

Zbigniew Jędrzejewski-Szmek committed over 14 years ago

Be more specific if upstream branch is not tracked

Zbigniew Jędrzejewski-Szmek committed over 14 years ago

Provide better message for barnhc_wiht_tpyo@{u}

Zbigniew Jędrzejewski-Szmek committed over 14 years ago

Provide branch name in error message when using @{u}

Zbigniew Jędrzejewski-Szmek committed over 14 years ago

t1507: add tests to document @{upstream} behaviour

Zbigniew Jędrzejewski-Szmek committed over 14 years ago

tests: add initial bash completion tests

Felipe Contreras committed over 14 years ago

cherry-pick: do not expect file arguments

Clemens Buchacher committed over 14 years ago

properly keep track of current working directory

Clemens Buchacher committed over 14 years ago

fast-import doc: cat-blob and ls responses need to be consumed quickly

Jonathan Nieder committed over 14 years ago

stash: use eval_gettextln correctly

Ross Lagerwall committed over 14 years ago

submodules: recursive fetch also checks new tags for submodule commits

Jens Lehmann committed over 14 years ago

test: am of empty patch should not succeed

Jonathan Nieder committed over 14 years ago

test: use test_i18ncmp for "Patch format detection failed" message

Jonathan Nieder committed over 14 years ago

test: do not rely on US English tracking-info messages

Jonathan Nieder committed over 14 years ago