projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ce9735d) | patch
git-gui: Update status bar during a merge.
authorShawn O. Pearce <spearce@spearce.org>
Fri, 26 Jan 2007 08:58:56 +0000 (03:58 -0500)
committerShawn O. Pearce <spearce@spearce.org>
Fri, 26 Jan 2007 08:58:56 +0000 (03:58 -0500)
commitee3cfb595415e2f076d5b90efba83088e5af961c
tree637bf5074eb115b35a0075250b6cd0fc78f59132tree | snapshot
parentce9735dfbd77ab7cbcb97ba8749b2f6eaa7f2527commit | diff
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>
git-gui.sh diff | blob | history
Git—the stupid content tracker