Merge branch 'maint'

Junio C Hamano committed over 14 years ago

git-submodule.sh: fix filename in comment.

Michał Górny committed over 14 years ago

git-add--interactive.perl: Remove two unused variables

Thomas Badie committed over 14 years ago

config: write to $XDG_CONFIG_HOME/git/config file when appropriate

Huynh Khoi Nguyen Nguyen committed over 14 years ago

Let core.attributesfile default to $XDG_CONFIG_HOME/git/attributes

Huynh Khoi Nguyen Nguyen committed over 14 years ago

Let core.excludesfile default to $XDG_CONFIG_HOME/git/ignore

Huynh Khoi Nguyen Nguyen committed over 14 years ago

config: read (but not write) from $XDG_CONFIG_HOME/git/config file

Huynh Khoi Nguyen Nguyen committed over 14 years ago

test-lib: reorder and include GIT-BUILD-OPTIONS a lot earlier

Junio C Hamano committed over 14 years ago

t/README: add a bit more Don'ts

Junio C Hamano committed over 14 years ago

tests: enclose $PERL_PATH in double quotes

Junio C Hamano committed over 14 years ago

t/test-lib.sh: export PERL_PATH for use in scripts

Junio C Hamano committed over 14 years ago

push: start warning upcoming default change for push.default

Matthieu Moy committed over 14 years ago

Merge branch 'maint'

Junio C Hamano committed over 14 years ago

Documentation: Fix misspellings

Leila Muhtasib committed over 14 years ago

clone: fix ref selection in --single-branch --branch=xxx

Nguyễn Thái Ngọc Duy committed over 14 years ago

Merge branch 'vr/help-per-platform'

Junio C Hamano committed over 14 years ago

Restore use of 'help.format' configuration property in 'git help'

Pat Thoyts committed over 14 years ago

diff-no-index: exit(1) if 'diff --quiet <repo file> <external file>' finds changes

Tim Henigan committed over 14 years ago

diff: handle relative paths in no-index

Jeff King committed over 14 years ago

Sync with 1.7.11.1

Junio C Hamano committed over 14 years ago