Merge GIT 1.5.0.4

git-mirror · Mar 14, 2007 · 803527f · 803527f
2 parents c47e6a4 + 3d4e193
commit 803527f
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/Documentation/RelNotes-1.5.0.4.txt 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
@@ -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
@@ -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