Merge branch 'th/git-diffall'

Junio C Hamano committed over 14 years ago

Merge branch 'th/doc-diff-submodule-option'

Junio C Hamano committed over 14 years ago

fetch/receive: remove over-pessimistic connectivity check

Junio C Hamano committed over 14 years ago

Documentation/difftool: add deltawalker to list of valid diff tools

Tim Henigan committed over 14 years ago

clean: preserve nested git worktree in subdirectories

Junio C Hamano committed over 14 years ago

notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwd

Johan Herland committed over 14 years ago

notes-merge: use opendir/readdir instead of using read_directory()

Johan Herland committed over 14 years ago

t3310: illustrate failure to "notes merge --commit" inside $GIT_DIR/

Johan Herland committed over 14 years ago

remove_dir_recursively(): Add flag for skipping removal of toplevel dir

Junio C Hamano committed over 14 years ago

t0303: resurrect commit message as test documentation

Zbigniew Jędrzejewski-Szmek committed over 14 years ago

t0303: immediately bail out w/o GIT_TEST_CREDENTIAL_HELPER

Zbigniew Jędrzejewski-Szmek committed over 14 years ago

Git 1.7.10-rc1

Junio C Hamano committed over 14 years ago

contrib/diffall: fix cleanup trap on Windows

Tim Henigan committed over 14 years ago

contrib/diffall: eliminate duplicate while loops

Tim Henigan committed over 14 years ago

contrib/diffall: eliminate use of tar

Tim Henigan committed over 14 years ago

contrib/diffall: create tmp dirs without mktemp

Tim Henigan committed over 14 years ago

contrib/diffall: comment actual reason for 'cdup'

Tim Henigan committed over 14 years ago

diff: tweak a _copy_ of diff_options with word-diff

Thomas Rast committed over 14 years ago

diff: refactor the word-diff setup from builtin_diff_cmd

Thomas Rast committed over 14 years ago

t4034: diff.*.wordregex should not be "sticky" in --word-diff

Johannes Sixt committed over 14 years ago