path: root/git-gui/
diff options
authorJunio C Hamano <>2011-10-16 10:01:44 (GMT)
committerJunio C Hamano <>2011-10-16 10:01:44 (GMT)
commit47d45a5ebd5bce543a50546d05e8b92c6971acda (patch)
tree9b386fabbcb80dd7993e94a3c189ed21b9b03147 /git-gui/
parentcdb51a13c3cf4830d499d1138160eacdd2b8aa46 (diff)
parent843d6597fbacfae02b8af7d6840992c92d0863f8 (diff)
Merge git://
* git:// git-gui: incremental goto line in blame view git-gui: clear the goto line input when hiding git-gui: only accept numbers in the goto-line input git-gui: search and linenumber input are mutual exclusive in the blame view git-gui: deal with unknown files when pressing the "Stage Changed" button git-gui: drop the 'n' and 'Shift-n' bindings from the last patch. git-gui: Add keyboard shortcuts for search and goto commands in blame view. git-gui: Enable jumping to a specific line number in blame view. Fix tooltip display with multiple monitors on windows. Fix typo: existant->existent git-gui: updated translator README for current procedures. git-gui: warn when trying to commit on a detached head git-gui: Corrected a typo in the Swedish translation of 'Continue'
Diffstat (limited to 'git-gui/')
1 files changed, 2 insertions, 1 deletions
diff --git a/git-gui/ b/git-gui/
index fd6a43d..f897160 100755
--- a/git-gui/
+++ b/git-gui/
@@ -854,6 +854,7 @@ set default_config(gui.fontdiff) [font configure font_diff]
# TODO: this option should be added to the git-config documentation
set default_config(gui.maxfilesdisplayed) 5000
set default_config(gui.usettk) 1
+set default_config(gui.warndetachedcommit) 1
set font_descs {
{fontui font_ui {mc "Main Font"}}
{fontdiff font_diff {mc "Diff/Console Font"}}
@@ -1526,7 +1527,7 @@ proc run_prepare_commit_msg_hook {} {
# prepare-commit-msg requires PREPARE_COMMIT_MSG exist. From git-gui
# it will be .git/MERGE_MSG (merge), .git/SQUASH_MSG (squash), or an
- # empty file but existant file.
+ # empty file but existent file.
set fd_pcm [open [gitdir PREPARE_COMMIT_MSG] a]