Skip to content

Commit 2416ad7

Browse files
committed
Merge branch 'js/increase-pane-sizes' into j6t-testing
* js/increase-pane-sizes: git-gui: fix layout problems with large windows Add screenshots to the README # Conflicts: # git-gui.sh
2 parents 01cde63 + 01b9325 commit 2416ad7

File tree

4 files changed

+9
-2
lines changed

4 files changed

+9
-2
lines changed

README.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,13 @@ page](https://git-scm.com/docs/git-gui).
1111
Git GUI was initially written by Shawn O. Pearce, and is distributed with the
1212
standard Git installation.
1313

14+
Examples of `git gui blame` and `git citool`, the most popular tools in the git-gui
15+
suite:
16+
17+
![git gui blame example](docs/git-gui-blame-example.png)
18+
19+
![git citool example](docs/git-citool-example.png)
20+
1421
# Building and installing
1522

1623
You need to have the following dependencies installed before you begin:

docs/git-citool-example.png

88 KB
Loading

docs/git-gui-blame-example.png

157 KB
Loading

git-gui.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3114,7 +3114,7 @@ pack .vpane -anchor n -side top -fill both -expand 1
31143114

31153115
# -- Working Directory File List
31163116

3117-
textframe .vpane.files.workdir -height 100 -width 200
3117+
textframe .vpane.files.workdir -height 300 -width 400
31183118
tlabel .vpane.files.workdir.title -text [mc "Unstaged Changes"] \
31193119
-background lightsalmon -foreground black
31203120
ttext $ui_workdir \
@@ -3135,7 +3135,7 @@ pack $ui_workdir -side left -fill both -expand 1
31353135

31363136
# -- Index File List
31373137
#
3138-
textframe .vpane.files.index -height 100 -width 200
3138+
textframe .vpane.files.index -height 300 -width 400
31393139
tlabel .vpane.files.index.title \
31403140
-text [mc "Staged Changes (Will Commit)"] \
31413141
-background lightgreen -foreground black

0 commit comments

Comments
 (0)