diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-07-12 01:45:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-07-12 01:45:56 -0700 |
| commit | 1b2782a5e2f88bf5e6e2cbb58e54fea015e21af5 (patch) | |
| tree | 19c5485ad50623c4c44d9268fdfa5afa98bd2619 /git-gui/lib/console.tcl | |
| parent | Clarify documentation of fast-import's D subcommand (diff) | |
| parent | git-gui: Work around bad interaction between Tcl and cmd.exe on ^{tree} (diff) | |
| download | git-1b2782a5e2f88bf5e6e2cbb58e54fea015e21af5.tar.gz git-1b2782a5e2f88bf5e6e2cbb58e54fea015e21af5.zip | |
Merge branch 'maint' of git://repo.or.cz/git-gui into maint
* 'maint' of git://repo.or.cz/git-gui:
git-gui: Work around bad interaction between Tcl and cmd.exe on ^{tree}
git-gui: Don't linewrap within console windows
git-gui: Correct ls-tree buffering problem in browser
git-gui: Skip nicknames when selecting author initials
git-gui: Ensure windows shortcuts always have .bat extension
git-gui: Include a Push action on the left toolbar
git-gui: Bind M1-P to push action
git-gui: Don't bind F5/M1-R in all windows
git-gui: Unlock the index when cancelling merge dialog
git-gui: properly popup error if gitk should be started but is not installed
Diffstat (limited to 'git-gui/lib/console.tcl')
| -rw-r--r-- | git-gui/lib/console.tcl | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/git-gui/lib/console.tcl b/git-gui/lib/console.tcl index ce25d92cac..34de5d4859 100644 --- a/git-gui/lib/console.tcl +++ b/git-gui/lib/console.tcl @@ -31,16 +31,20 @@ method _init {} { -background white -borderwidth 1 \ -relief sunken \ -width 80 -height 10 \ + -wrap none \ -font font_diff \ -state disabled \ + -xscrollcommand [list $w.m.sbx set] \ -yscrollcommand [list $w.m.sby set] label $w.m.s -text {Working... please wait...} \ -anchor w \ -justify left \ -font font_uibold + scrollbar $w.m.sbx -command [list $w.m.t xview] -orient h scrollbar $w.m.sby -command [list $w.m.t yview] pack $w.m.l1 -side top -fill x pack $w.m.s -side bottom -fill x + pack $w.m.sbx -side bottom -fill x pack $w.m.sby -side right -fill y pack $w.m.t -side left -fill both -expand 1 pack $w.m -side top -fill both -expand 1 -padx 5 -pady 10 |