summaryrefslogtreecommitdiff
path: root/git-gui
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 /git-gui
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
Diffstat (limited to 'git-gui')
-rw-r--r--git-gui/lib/error.tcl2
1 files changed, 1 insertions, 1 deletions
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 \