Merge branch 'maint'

Junio C Hamano committed about 18 years ago

Fix mismerge at cdb22c4 in builtin-checkout.c

Junio C Hamano committed about 18 years ago

git-merge-recursive: honor merge.conflictstyle once again

Matt McCutchen committed about 18 years ago

Git.pm: do not break inheritance

Christian Jaeger committed about 18 years ago

parse-opt: migrate builtin-checkout-index.

Miklos Vajna committed about 18 years ago

Documentation: add manpage about workflows

Thomas Rast committed about 18 years ago

Documentation: Spelling fix

Fredrik Skolmli committed about 18 years ago

Merge branch 'pb/rename-rowin32'

Junio C Hamano committed about 18 years ago

Enhance hold_lock_file_for_{update,append}() API

Junio C Hamano committed about 18 years ago

demonstrate breakage of detached checkout with symbolic link HEAD

Junio C Hamano committed about 18 years ago

Documentation: Clarify '--signoff' for git-commit

Abhijit Bhopatkar committed about 18 years ago

reset --hard/read-tree --reset -u: remove unmerged new paths

Junio C Hamano committed about 18 years ago

Update draft release notes for 1.6.1

Junio C Hamano committed about 18 years ago

Merge branch 'maint'

Junio C Hamano committed about 18 years ago

Hopefully the final draft release notes update before 1.6.0.3

Junio C Hamano committed about 18 years ago

diff(1): clarify what "T"ypechange status means

Junio C Hamano committed about 18 years ago

Merge branch 'db/maint-checkout-b' into maint

Junio C Hamano committed about 18 years ago

diff: add filter for converting binary to text

Jeff King committed about 18 years ago

diff: introduce diff.<driver>.binary

Jeff King committed about 18 years ago

diff: unify external diff and funcname parsing code

Jeff King committed about 18 years ago