Merge branch 'da/maint-python-startup'

Junio C Hamano committed over 16 years ago

Merge branch 'ic/bash-completion-rpm'

Junio C Hamano committed over 16 years ago

Merge branch 'sb/fmt-merge-msg'

Junio C Hamano committed over 16 years ago

Merge branch 'jc/conflict-marker-size'

Junio C Hamano committed over 16 years ago

Merge branch 'ef/maint-empty-commit-log'

Junio C Hamano committed over 16 years ago

Merge branch 'sg/bash-completion'

Junio C Hamano committed over 16 years ago

log --pretty/--oneline: ignore log.decorate

Junio C Hamano committed over 16 years ago

Add `%B' in format strings for raw commit body in `git log' and friends

Eli Barzilay committed over 16 years ago

Revert "Link against libiconv on IRIX"

Junio C Hamano committed over 16 years ago

Rename ONE_FILESYSTEM to DISCOVERY_ACROSS_FILESYSTEM

Junio C Hamano committed over 16 years ago

remote-helpers: add tests for testgit helper

Sverre Rabbelier committed over 16 years ago

whitespace: tests for git-apply --whitespace=fix with tab-in-indent

Chris Webb committed over 16 years ago

whitespace: add tab-in-indent support for --whitespace=fix

Chris Webb committed over 16 years ago

whitespace: replumb ws_fix_copy to take a strbuf *dst instead of char *dst

Chris Webb committed over 16 years ago

whitespace: tests for git-diff --check with tab-in-indent error class

Chris Webb committed over 16 years ago

GIT_ONE_FILESYSTEM: flip the default to stop at filesystem boundaries

Junio C Hamano committed over 16 years ago

Merge branch 'maint'

Junio C Hamano committed over 16 years ago

pack-protocol.txt: fix pkt-line lengths

Tay Ray Chuan committed over 16 years ago

pack-protocol.txt: fix spelling

Tay Ray Chuan committed over 16 years ago

Teach mailinfo %< as an alternative scissors mark

Jonathan Nieder committed over 16 years ago