author | Junio C Hamano <gitster@pobox.com> | |
Sat, 1 Mar 2008 05:22:31 +0000 (21:22 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sat, 1 Mar 2008 05:22:31 +0000 (21:22 -0800) |
* 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
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
Documentation/git-cherry-pick.txt | patch | blob | history | |
contrib/emacs/git.el | patch | blob | history | |
git-gui/lib/error.tcl | patch | blob | history |
index 877ab66ef5c032af09ace5597bac64fd7739f468..f0beb412e655f0e188b8a1427b41f72b6cc61239 100644 (file)
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 cc21e9c682e4b4528de03f59e0ff8b8e6ef26b8d..c9268234a5b7342849a7a711e0bb0c6e4f003754 100644 (file)
--- a/contrib/emacs/git.el
+++ b/contrib/emacs/git.el
(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 08a24622c7ff199399805ef34f0396f6cb81613c..8c27678e3a45c011cfc6a21f5d53b0d87c66b4a6 100644 (file)
--- a/git-gui/lib/error.tcl
+++ b/git-gui/lib/error.tcl
append title " ([reponame])"
}
tk_messageBox \
- -parent $parent \
+ -parent [_error_parent] \
-icon info \
-type ok \
-title $title \