Merge branch 'maint-1.6.0' into maint

Junio C Hamano committed over 17 years ago

improve error message in config.c

Alex Riesen committed over 17 years ago

t4018-diff-funcname: add cpp xfuncname pattern to syntax test

Brandon Casey committed over 17 years ago

Work around BSD whose typeof(tv.tv_sec) != time_t

Bernd Ahlers committed over 17 years ago

git-am.txt: reword extra headers in message body

Stephen Boyd committed over 17 years ago

git-am.txt: Use date or value instead of time or timestamp

Stephen Boyd committed over 17 years ago

git-am.txt: add an 'a', say what 'it' is, simplify a sentence

Stephen Boyd committed over 17 years ago

completion: complete values for send-email

Stephen Boyd committed over 17 years ago

completion: complete values for log.date

Stephen Boyd committed over 17 years ago

completion: complete values for help.format

Stephen Boyd committed over 17 years ago

completion: add {gui,diff,merge}tool, man, and pager config variables

Stephen Boyd committed over 17 years ago

completion: add missing configuration variables to _git_config()

Stephen Boyd committed over 17 years ago

dir.c: Fix two minor grammatical errors in comments

Allan Caffee committed over 17 years ago

git-svn: fix a sloppy Getopt::Long usage

Robin H. Johnson committed over 17 years ago

Sync with GIT 1.6.2.5

Junio C Hamano committed over 17 years ago

GIT 1.6.2.5

Junio C Hamano committed over 17 years ago

Merge branch 'np/maint-no-ofs-delta' into maint

Junio C Hamano committed over 17 years ago

Merge branch 'maint-1.6.1' into maint

Junio C Hamano committed over 17 years ago

GIT 1.6.1.4

Junio C Hamano committed over 17 years ago

Merge branch 'jc/maint-read-tree-multi' into maint

Junio C Hamano committed over 17 years ago