| commit | 1fc4ba86f80c1365943abac54679dd1924a6737b | |
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Thu, 3 May 2007 22:21:39 +0000 (3 18:21 -0400) | ||
| committer | Shawn O. Pearce <spearce@spearce.org> | |
| Tue, 8 May 2007 03:35:52 +0000 (7 23:35 -0400) | ||
| tree | a0d153c1e578d4746ee9456d2d73d4900b378771 | treesnapshot (tar.gz zip) |
| parent | 349f92e3a25216b6f79c58044d74b61c89de20b8 | commitdiff |
git-gui: Include commit id/subject in merge choices
When merging branches using our local merge feature it can be
handy to know the first few digits of the commit the ref points
at as well as the short description of the branch name.
Unfortunately I'm unable to use three listboxes in a row, as Tcl
freaks out and refuses to let me have a selection in more than
one of them at any given point in time. So instead we use a
fixed width font in the existing listbox and organize the data
into three columns. Not nearly as nice looking, but users can
continue to use the listbox's features.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
When merging branches using our local merge feature it can be
handy to know the first few digits of the commit the ref points
at as well as the short description of the branch name.
Unfortunately I'm unable to use three listboxes in a row, as Tcl
freaks out and refuses to let me have a selection in more than
one of them at any given point in time. So instead we use a
fixed width font in the existing listbox and organize the data
into three columns. Not nearly as nice looking, but users can
continue to use the listbox's features.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| lib/merge.tcl | diffblobblamehistory |