Merge branch 'js/maint-merge-use-prepare-commit-msg-hook' into maint

Junio C Hamano committed over 15 years ago

gitweb: highlight: replace tabs with spaces

Kevin Cernekee committed over 15 years ago

diff --quiet: disable optimization when --diff-filter=X is used

Junio C Hamano committed over 15 years ago

git-p4: test sync new branch

Pete Wyckoff committed over 15 years ago

git-p4: fix sync new branch regression

Pete Wyckoff committed over 15 years ago

make_absolute_path: return the input path if it points to our buffer

Carlos Martín Nieto committed over 15 years ago

valgrind: ignore SSE-based strlen invalid reads

Carlos Martín Nieto committed over 15 years ago

vcs-svn: remove spurious semicolons

Jonathan Nieder committed over 15 years ago

diff --submodule: split into bite-sized pieces

Jonathan Nieder committed over 15 years ago

cherry: split off function to print output lines

Jonathan Nieder committed over 15 years ago

branch: split off function that writes tracking info and commit subject

Jonathan Nieder committed over 15 years ago

standardize brace placement in struct definitions

Jonathan Nieder committed over 15 years ago

compat: make gcc bswap an inline function

Jonathan Nieder committed over 15 years ago

enums: omit trailing comma for portability

Jonathan Nieder committed over 15 years ago

Merge branch 'nd/struct-pathspec'

Junio C Hamano committed over 15 years ago

declare 1-bit bitfields to be unsigned

Jonathan Nieder committed over 15 years ago

git-p4: Fix error message crash in P4Sync.commit.

Tor Arvid Lund committed over 15 years ago

Teach git-p4 to ignore case in perforce filenames if configured.

Tor Arvid Lund committed over 15 years ago

git-p4: Teach gitConfig method about arguments.

Tor Arvid Lund committed over 15 years ago

git-bisect.txt: example for bisecting with hot-fix

Michael J Gruber committed over 15 years ago