Shawn O. Pearce ee3cfb5954 git-gui: Update status bar during a merge. ...

I got slightly confused when I did two merges in a row, as the status
bar said "merge completed successfully" while the second merge was
still running.  Now we show what branches are actively being merged.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

2007-01-26 03:58:56 -05:00

.gitignore

git-gui: Ensure version number is always current.

2007-01-21 02:54:19 -05:00

git-gui.sh

git-gui: Update status bar during a merge.

2007-01-26 03:58:56 -05:00

GIT-VERSION-GEN

git-gui: Ensure version number is always current.

2007-01-21 02:54:19 -05:00

Makefile

git-gui: Ensure version number is always current.

2007-01-21 02:54:19 -05:00

TODO

git-gui: Update todo list with finished and new items.

2007-01-21 22:47:59 -05:00

Description

No description provided

663 MiB

Languages

C 50.5%

Shell 38.7%

Perl 4.5%

Tcl 3.2%

Python 0.8%

Other 2.1%