Merge branch 'ef/mingw-tty-getpass'

Junio C Hamano committed almost 14 years ago

Merge branch 'maint'

Junio C Hamano committed almost 14 years ago

git-prompt: Document GIT_PS1_DESCRIBE_STYLE

Anders Kaseorg committed almost 14 years ago

fetch: ignore wildcarded refspecs that update local symbolic refs

Junio C Hamano committed almost 14 years ago

gitweb: Sort projects with undefined ages last

Matthew Daley committed almost 14 years ago

strbuf_add_wrapped*(): Remove unused return value

Steffen Prohaska committed almost 14 years ago

shortlog: fix wrapping lines of wraplen

Steffen Prohaska committed almost 14 years ago

sh-setup: work around "unset IFS" bug in some shells

Junio C Hamano committed almost 14 years ago

Sync with 1.8.0.2

Junio C Hamano committed almost 14 years ago

Git 1.8.0.2

Junio C Hamano committed almost 14 years ago

format_commit_message(): simplify calls to logmsg_reencode()

Junio C Hamano committed almost 14 years ago

Makefile: whitespace style fixes in macro definitions

Stefano Lattarini committed almost 14 years ago

mingw_rmdir: do not prompt for retry when non-empty

Erik Faye-Lund committed almost 14 years ago

Documentation/git-stash.txt: add a missing verb

Sébastien Loriot committed almost 14 years ago

Which merge_file() function do you mean?

Junio C Hamano committed almost 14 years ago

t9402: Use TABs for indentation

Torsten Bögershausen committed almost 14 years ago

t9402: Rename check.cvsCount and check.list

Torsten Bögershausen committed almost 14 years ago

t9402: Simplify git ls-tree

Torsten Bögershausen committed almost 14 years ago

t9402: Add missing &&; Code style

Torsten Bögershausen committed almost 14 years ago

t9402: No space after IO-redirection

Torsten Bögershausen committed almost 14 years ago