git, branch v1.6.6-rc2

Git 1.6.6-rc2

2009-12-10T00:21:36Z

Signed-off-by: Junio C Hamano

Merge git://repo.or.cz/git-gui

2009-12-09T23:38:51Z

* git://repo.or.cz/git-gui: git-gui: suppress RenderBadPicture X error caused by Tk bug git-gui: Increase blame viewer usability on MacOS. git-gui: search 4 directories to improve statistic of gc hint git gui: make current branch default in "remote delete branch" merge check

Merge git://git.kernel.org/pub/scm/gitk/gitk

2009-12-09T23:38:42Z

* git://git.kernel.org/pub/scm/gitk/gitk: gitk: Fix selection of tags gitk: Default to the system colours on Windows gitk: Update Japanese translation gitk: Fix "git gui blame" invocation when called from top-level directory gitk: Disable checkout of remote branches gitk: Improve appearance of radiobuttons and checkbuttons gitk: Skip translation of "wrong Tcl version" message gitk: Add Japanese translation gitk: Use the --submodule option for displaying diffs when available gitk: Fix diffing committed -> staged (typo in diffcmd) gitk: Add configuration for UI colour scheme gitk: Don't compare fake children when comparing commits gitk: Show diff of commits at end of compare-commits output gitk: Add a user preference to enable/disable use of themed widgets gitk: Fix errors in the theme patch gitk: Use themed tk widgets gitk: Restore scrolling position of diff pane on back/forward in history

Update draft release notes to 1.6.6 before -rc2

2009-12-09T21:38:52Z

Reword the 1.7.0 warnings, and drop deprecation of "merge HEAD ..." syntax. Signed-off-by: Junio C Hamano

Merge branch 'maint'

2009-12-09T06:47:09Z

* maint: add-interactive: fix deletion of non-empty files pull: clarify advice for the unconfigured error case

Merge branch 'mm/maint-merge-ff-error-message-fix' into maint

2009-12-09T06:42:23Z

* mm/maint-merge-ff-error-message-fix: builtin-merge: show user-friendly error messages for fast-forward too. merge-recursive: make the error-message generation an extern function Conflicts: merge-recursive.c

Merge branch 'jn/maint-pull-rebase-error-message' into maint

2009-12-09T06:39:20Z

* jn/maint-pull-rebase-error-message: pull: clarify advice for the unconfigured error case

Merge branch 'jk/maint-add-p-delete-fix' into maint

2009-12-09T06:37:50Z

* jk/maint-add-p-delete-fix: add-interactive: fix deletion of non-empty files

Merge git://git.bogomips.org/git-svn

2009-12-09T05:59:04Z

* git://git.bogomips.org/git-svn: git-svn: set svn.authorsfile earlier when cloning git-svn: Set svn.authorsfile to an absolute path when cloning

git-svn: set svn.authorsfile earlier when cloning

2009-12-09T04:39:58Z

If a clone errors out because of a missing author, or user interrupt, this allows `git svn fetch` to resume seamlessly, rather than forcing the user to re-provide the path to the authors file. [ew: shortened subject] Signed-off-by: Alex Vandiver Acked-by: Eric Wong