Merge branch 'mh/string-list'

Junio C Hamano committed about 14 years ago

Merge branch 'jc/maint-blame-no-such-path'

Junio C Hamano committed about 14 years ago

make poll() work on platforms that can't recv() on a non-socket

Joachim Schmitz committed about 14 years ago

poll() exits too early with EFAULT if 1st arg is NULL

Joachim Schmitz committed about 14 years ago

fix some win32 specific dependencies in poll.c

Joachim Schmitz committed about 14 years ago

make poll available for other platforms lacking it

Joachim Schmitz committed about 14 years ago

mailinfo: do not concatenate charset= attribute values from mime headers

Junio C Hamano committed about 14 years ago

t/perf: add "trash directory" to .gitignore

Ramkumar Ramachandra committed about 14 years ago

Add missing -z to git check-attr usage text for consistency with man page

Adam Spiers committed about 14 years ago

git-jump: ignore (custom) prefix in diff mode

Mischa POSLAWSKY committed about 14 years ago

Documentation: indent-with-non-tab uses "equivalent tabs" not 8

Wesley J. Landaker committed about 14 years ago

git-gui: remove .git/CHERRY_PICK_HEAD after committing

Beat Bolli committed about 14 years ago

git-gui: Fix a loose/lose mistake

Beat Bolli committed about 14 years ago

git-gui: Fix semi-working shortcuts for unstage and revert

Vitaly _Vi Shukela committed about 14 years ago

completion: add --no-edit to git-commit

Yacine Belkadi committed about 14 years ago

Add userdiff patterns for Ada

Adrian Johnson committed about 14 years ago

git-p4: add submit --conflict option and config varaiable

Pete Wyckoff committed about 14 years ago

git p4: add submit --prepare-p4-only option

Pete Wyckoff committed about 14 years ago

git p4: add submit --dry-run option

Pete Wyckoff committed about 14 years ago

git p4: accept -v for --verbose

Pete Wyckoff committed about 14 years ago