Merge branch 'maint'

gitster · gitster · commit df4a824341f3 · 2008-02-29T21:22:31.000-08:00
* maint:
  Documentation cherry-pick: Fix cut-and-paste error
  git.el: find the git-status buffer whatever its name is
  git-gui: Paper bag fix info dialog when no files are staged at commit
diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
@@ -45,7 +45,7 @@ OPTIONS
 	default is not to do `-x` so this option is a no-op.
 
 -m parent-number|--mainline parent-number::
-	Usually you cannot revert a merge because you do not know which
+	Usually you cannot cherry-pick a merge because you do not know which
 	side of the merge should be considered the mainline.  This
 	option specifies the parent number (starting from 1) of
 	the mainline and allows cherry-pick to replay the change
diff --git a/contrib/emacs/git.el b/contrib/emacs/git.el
@@ -1545,7 +1545,7 @@ Commands:
         (with-current-buffer buffer
           (when (and list-buffers-directory
                      (string-equal fulldir (expand-file-name list-buffers-directory))
-                     (string-match "\\*git-status\\*$" (buffer-name buffer)))
+		     (eq major-mode 'git-status-mode))
             (setq found buffer))))
       (setq list (cdr list)))
     found))
diff --git a/git-gui/lib/error.tcl b/git-gui/lib/error.tcl
@@ -47,7 +47,7 @@ proc info_popup {msg} {
 		append title " ([reponame])"
 	}
 	tk_messageBox \
-		-parent $parent \
+		-parent [_error_parent] \
 		-icon info \
 		-type ok \
 		-title $title \

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ proc info_popup {msg} {`
`47`	`47`	`append title " ([reponame])"`
`48`	`48`	`}`
`49`	`49`	`tk_messageBox \`
`50`		`- -parent $parent \`
	`50`	`+ -parent [_error_parent] \`
`51`	`51`	`-icon info \`
`52`	`52`	`-type ok \`
`53`	`53`	`-title $title \`