Merge branch 'maint'

Junio C Hamano committed over 17 years ago

grep: Add --max-depth option.

Michał Kiedrowicz committed over 17 years ago

Trailing whitespace and no newline fix

SZEDER Gábor committed over 17 years ago

diff --cc: a lost line at the beginning of the file is shown incorrectly

Junio C Hamano committed over 17 years ago

combine-diff.c: fix performance problem when folding common deleted lines

Junio C Hamano committed over 17 years ago

Fix rebase -p --onto

Greg Price committed over 17 years ago

git svn: fix reparenting when ugly http(s) URLs are used

Eric Wong committed over 17 years ago

git svn: rename tests that had conflicting numbers

Eric Wong committed over 17 years ago

show: add space between multiple items

Jeff King committed over 17 years ago

show: suppress extra newline when showing annotated tag

Jeff King committed over 17 years ago

pull: support rebased upstream + fetch + pull --rebase

Santi Béjar committed over 17 years ago

t5520-pull: Test for rebased upstream + fetch + pull --rebase

Santi Béjar committed over 17 years ago

Updates to draft release notes to 1.6.4

Junio C Hamano committed over 17 years ago

push: do not give big warning when no preference is configured

Junio C Hamano committed over 17 years ago

t4202-log.sh: Test git log --no-walk sort order

Michael J Gruber committed over 17 years ago

cvsexportcommit: reorder tests to quiet intermittent failure

Mike Ralphson committed over 17 years ago

Merge branch 'maint'

Junio C Hamano committed over 17 years ago

checkout -f: deal with a D/F conflict entry correctly

Junio C Hamano committed over 17 years ago

sha1_name.c: avoid unnecessary strbuf_release

Brandon Casey committed over 17 years ago

refs.c: release file descriptor on error return

Brandon Casey committed over 17 years ago