Kick off 1.7.0 cycle

Junio C Hamano committed almost 17 years ago

Merge branch 'gb/1.7.0-diff-whitespace-only-output'

Junio C Hamano committed almost 17 years ago

Merge branch 'jc/1.7.0-diff-whitespace-only-status'

Junio C Hamano committed almost 17 years ago

Merge branch 'jc/1.7.0-push-safety'

Junio C Hamano committed almost 17 years ago

Merge branch 'jc/1.7.0-send-email-no-thread-default'

Junio C Hamano committed almost 17 years ago

Merge branch 'sr/vcs-helper'

Junio C Hamano committed almost 17 years ago

t4019 "grep" portability fix

Junio C Hamano committed almost 17 years ago

t1200: work around a bug in some implementations of "find"

Junio C Hamano committed almost 17 years ago

rerere: remove silly 1024-byte line limit

Junio C Hamano committed almost 17 years ago

resolve-undo: teach "update-index --unresolve" to use resolve-undo info

Junio C Hamano committed almost 17 years ago

resolve-undo: "checkout -m path" uses resolve-undo information

Junio C Hamano committed almost 17 years ago

resolve-undo: allow plumbing to clear the information

Junio C Hamano committed almost 17 years ago

resolve-undo: basic tests

Junio C Hamano committed almost 17 years ago

resolve-undo: record resolved conflicts in a new index extension section

Junio C Hamano committed almost 17 years ago

builtin-merge.c: use standard active_cache macros

Junio C Hamano committed almost 17 years ago

Git 1.6.6

Junio C Hamano committed almost 17 years ago

git svn: add test for a git svn gc followed by a git svn mkdirs

Robert Zeh committed almost 17 years ago

git svn: branch/tag commands detect username in URLs

Eric Wong committed almost 17 years ago

Merge branch 'maint'

Junio C Hamano committed almost 17 years ago

git svn: lookup new parents correctly from svn:mergeinfo

Eric Wong committed almost 17 years ago