Merge in GIT 1.5.3.8

diff --git a/git-gui/lib/commit.tcl b/git-gui/lib/commit.tcl
index 10b0430f54863111268a4b67364cbc678b0eb50d..1c0586c409b1700f250270a87f178f621989c32b 100644 (file)
--- a/git-gui/lib/commit.tcl
+++ b/git-gui/lib/commit.tcl
@@ -184,7 +184,7 @@ You must stage at least 1 file before you can commit.
 
 A good commit message has the following format:
 
-- First line: Describe in one sentance what you did.
+- First line: Describe in one sentence what you did.
 - Second line: Blank
 - Remaining lines: Describe why this change is good.
 "]
@@ -303,7 +303,7 @@ A rescan will be automatically started now.
                puts stderr [mc "warning: Tcl does not support encoding '%s'." $enc]
                fconfigure $msg_wt -encoding utf-8
        }
-       puts -nonewline $msg_wt $msg
+       puts $msg_wt $msg
        close $msg_wt
 
        # -- Create the commit.