Merge branch 'maint'

Junio C Hamano committed over 17 years ago

completion: add missing options to show-branch and show

Stephen Boyd committed over 17 years ago

dir.c: clean up handling of 'path' parameter in read_directory_recursive()

Linus Torvalds committed over 17 years ago

Fix type-punning issues

Dan McGee committed over 17 years ago

Merge branch 'maint'

Junio C Hamano committed over 17 years ago

test: checkout shouldn't say that HEAD has moved if it didn't

Nanako Shiraishi committed over 17 years ago

completion: enhance "current branch" display

Junio C Hamano committed over 17 years ago

completion: simplify "current branch" in __git_ps1()

Junio C Hamano committed over 17 years ago

completion: fix PS1 display during a merge on detached HEAD

Junio C Hamano committed over 17 years ago

Improve the naming of guessed target repository for git clone

Alex Riesen committed over 17 years ago

Use UTF-8 instead of utf8 for backward compatibility

Alex Riesen committed over 17 years ago

Revert "git-add--interactive: remove hunk coalescing"

Junio C Hamano committed over 17 years ago

Splitting a hunk that adds a line at the top fails in "add -p"

Matt Graham committed over 17 years ago

builtin-checkout: Don't tell user that HEAD has moved before it has

Daniel Cordero committed over 17 years ago

pre-commit.sample: don't print incidental SHA1

Jim Meyering committed over 17 years ago

tests: Add tests for missing format-patch long options

Stephen Boyd committed over 17 years ago

api-parse-options.txt: use 'func' instead of 'funct'

Stephen Boyd committed over 17 years ago

mktree: validate entry type in input

Josh Micich committed over 17 years ago

mktree --batch: build more than one tree object

Josh Micich committed over 17 years ago

mktree --missing: updated usage message and man page

Josh Micich committed over 17 years ago