Merge GIT 1.5.0.4

diff --git a/Documentation/RelNotes-1.5.0.4.txt b/Documentation/RelNotes-1.5.0.4.txt
new file mode 100644 (file)
index 0000000..b727a8d
--- /dev/null
+++ b/Documentation/RelNotes-1.5.0.4.txt
@@ -0,0 +1,24 @@
+GIT v1.5.0.4 Release Notes
+==========================
+
+Fixes since v1.5.0.3
+--------------------
+
+* Bugfixes
+
+  - git.el does not add duplicate sign-off lines.
+
+  - git-commit shows the full stat of the resulting commit, not
+    just about the files in the current directory, when run from
+    a subdirectory.
+
+  - "git-checkout -m '@{8 hours ago}'" had a funny failure from
+    eval; fixed.
+
+  - git-gui updates.
+
+* Documentation updates
+
+* User manual updates
+
+

diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index 68de5881bd36aabd1b4b13c2bce48a226c34788e..c759efb7fc6ebb69d9c6b59e23e31f33e0596675 100644 (file)
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@ -86,7 +86,7 @@ OPTIONS
        Remove the line matching the key from config file.
 
 --unset-all::
-       Remove all matching lines from config file.
+       Remove all lines matching the key from config file.
 
 -l, --list::
        List all variables set in config file.

diff --git a/git-checkout.sh b/git-checkout.sh
index 6caa9fdcc660b6fee063bfccbc51e46331e911c7..fcadf200ee990f195ce3f5c72306cbf0206277cd 100755 (executable)
--- a/git-checkout.sh
+++ b/git-checkout.sh
@@ -205,7 +205,7 @@ else
        work=`git write-tree` &&
        git read-tree --reset -u $new || exit
 
-       eval GITHEAD_$new=${new_name:-${branch:-$new}} &&
+       eval GITHEAD_$new='${new_name:-${branch:-$new}}' &&
        eval GITHEAD_$work=local &&
        export GITHEAD_$new GITHEAD_$work &&
        git merge-recursive $old -- $new $work