git, branch v1.7.3-rc2

Git 1.7.3 rc2

2010-09-15T19:47:37Z

Merge branch 'dr/maint-ls-tree-prefix-recursion-fix'

2010-09-15T19:41:13Z

* dr/maint-ls-tree-prefix-recursion-fix: ls-tree $di $dir: do not mistakenly recurse into directories

Merge branch 'os/fix-rebase-diff-no-prefix'

2010-09-15T19:40:33Z

* os/fix-rebase-diff-no-prefix: Add --src/dst-prefix to git-formt-patch in git-rebase.sh

Merge branch 'jl/fix-test'

2010-09-15T19:40:12Z

* jl/fix-test: t1020: Get rid of 'cd "$HERE"' at the start of each test t2016 (checkout -p): add missing && t1302 (core.repositoryversion): style tweaks t2105 (gitfile): add missing && t1450 (fsck): remove dangling objects tests: subshell indentation stylefix Several tests: cd inside subshell instead of around

Merge branch 'ch/filter-branch-deprecate-remap-to-ancestor'

2010-09-15T19:39:32Z

* ch/filter-branch-deprecate-remap-to-ancestor: filter-branch: retire --remap-to-ancestor

Merge branch 'ch/maint-cannot-create-bundle-error'

2010-09-15T19:39:22Z

* ch/maint-cannot-create-bundle-error: bundle: detect if bundle file cannot be created

Merge branch 'ks/recursive-rename-add-identical'

2010-09-15T19:39:12Z

* ks/recursive-rename-add-identical: RE: [PATCH] Avoid rename/add conflict when contents are identical

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

2010-09-15T19:34:48Z

* 'master' of git://repo.or.cz/git-gui: git-gui 0.13 git-gui: avoid mis-encoding the copyright message on Windows. git-gui: Update Swedish translation (521t). git-gui: ensure correct application termination in git-gui--askpass git-gui: handle textconv filter on Windows and in development git-gui: use shell to launch textconv filter in "blame" git-gui: display error launching blame as a message box. git-gui: Make usage statement visible on Windows.

git-gui 0.13

2010-09-14T21:42:37Z

Signed-off-by: Pat Thoyts

git-gui: avoid mis-encoding the copyright message on Windows.

2010-09-13T19:41:42Z

On Windows the tcl script file will use the system encoding and attempting to convert the copyright mis-encodes the string. Instead, keep the message as ASCII and substitute in the correct unicode character when running. Signed-off-by: Pat Thoyts