![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Tue, 4 Sep 2007 03:07:59 +0000 (23:07 -0400) | ||
| committer | Shawn O. Pearce <spearce@spearce.org> | |
| Tue, 4 Sep 2007 03:07:59 +0000 (23:07 -0400) | ||
| commit | 4b08aa3fef4258bf27f1bfa11fb9c0a8315c61aa | |
| tree | cc25debce76b3b1d8120ca44ea954df29a1685ed | tree | snapshot |
| parent | 12fb223326b561132d528bb010c6bdeaa828acd3 | commit | diff |
| parent | 047d94d505c9837a60c28e121de65471dadce74b | commit | diff |
Merge branch 'maint'
* maint:
git-gui: Properly set the state of "Stage/Unstage Hunk" action
git-gui: Fix detaching current branch during checkout
git-gui: Correct starting of git-remote to handle -w option
Conflicts:
git-gui.sh
* maint:
git-gui: Properly set the state of "Stage/Unstage Hunk" action
git-gui: Fix detaching current branch during checkout
git-gui: Correct starting of git-remote to handle -w option
Conflicts:
git-gui.sh
| git-gui.sh | diff1 | | diff2 | | blob | history |
| lib/checkout_op.tcl | diff1 | | diff2 | | blob | history |