git, branch v1.6.6.1

Git 1.6.6.1

2010-01-20T21:29:21Z

Signed-off-by: Junio C Hamano

Merge branch 'bg/maint-remote-update-default' into maint

2010-01-20T21:23:59Z

* bg/maint-remote-update-default: Fix "git remote update" with remotes.defalt set

Merge branch 'sb/maint-octopus' into maint

2010-01-20T21:02:24Z

* sb/maint-octopus: octopus: remove dead code octopus: reenable fast-forward merges octopus: make merge process simpler to follow Conflicts: git-merge-octopus.sh

Merge branch 'bg/maint-add-all-doc' into maint

2010-01-20T21:01:33Z

* bg/maint-add-all-doc: git-rm doc: Describe how to sync index & work tree git-add/rm doc: Consistently back-quote Documentation: 'git add -A' can remove files

Merge branch 'maint-1.6.5' into maint

2010-01-20T21:01:19Z

* maint-1.6.5: Git 1.6.5.8 Fix mis-backport of t7002 bash completion: factor submodules into dirty state reset: unbreak hard resets with GIT_WORK_TREE Conflicts: Documentation/git.txt GIT-VERSION-GEN RelNotes

Git 1.6.5.8

2010-01-20T20:44:59Z

Signed-off-by: Junio C Hamano

Merge branch 'jk/maint-1.6.5-reset-hard' into maint-1.6.5

2010-01-20T20:22:58Z

* jk/maint-1.6.5-reset-hard: reset: unbreak hard resets with GIT_WORK_TREE

Merge branch 'tr/maint-1.6.5-bash-prompt-show-submodule-changes' into maint-1.6.5

2010-01-20T20:22:54Z

* tr/maint-1.6.5-bash-prompt-show-submodule-changes: bash completion: factor submodules into dirty state

Merge branch 'dp/maint-1.6.5-fast-import-non-commit-tag' into maint-1.6.5

2010-01-20T20:17:24Z

* dp/maint-1.6.5-fast-import-non-commit-tag: fast-import: tag may point to any object type

Merge branch 'jm/maint-1.6.5-grep-NUL-terminate' into maint-1.6.5

2010-01-20T20:16:46Z

* jm/maint-1.6.5-grep-NUL-terminate: grep: NUL terminate input from a file