summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-03-01 05:22:31 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-03-01 05:22:31 (GMT)
commitdf4a824341f34b1d2d890ce3e9dd7f6df6475953 (patch)
tree39260cf419b5f6f71cbfd39a4fa508a5ed0122cd
parentc6fef0bbea485ff8aec979177ee5c1c568fffc55 (diff)
parent84989bd820119260c4fcd0dd5ee8a50bc8ff0d2c (diff)
downloadgit-df4a824341f34b1d2d890ce3e9dd7f6df6475953.zip
git-df4a824341f34b1d2d890ce3e9dd7f6df6475953.tar.gz
git-df4a824341f34b1d2d890ce3e9dd7f6df6475953.tar.bz2
Merge branch 'maint'
* 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
-rw-r--r--Documentation/git-cherry-pick.txt2
-rw-r--r--contrib/emacs/git.el2
-rw-r--r--git-gui/lib/error.tcl2
3 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
index 877ab66..f0beb41 100644
--- 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
index cc21e9c..c926823 100644
--- 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
index 08a2462..8c27678 100644
--- 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 \