diff options
author | Shawn O. Pearce <spearce@spearce.org> | 2007-09-04 03:07:59 (GMT) |
---|---|---|
committer | Shawn O. Pearce <spearce@spearce.org> | 2007-09-04 03:07:59 (GMT) |
commit | 4b08aa3fef4258bf27f1bfa11fb9c0a8315c61aa (patch) | |
tree | cc25debce76b3b1d8120ca44ea954df29a1685ed /Makefile | |
parent | 12fb223326b561132d528bb010c6bdeaa828acd3 (diff) | |
parent | 047d94d505c9837a60c28e121de65471dadce74b (diff) | |
download | git-4b08aa3fef4258bf27f1bfa11fb9c0a8315c61aa.zip git-4b08aa3fef4258bf27f1bfa11fb9c0a8315c61aa.tar.gz git-4b08aa3fef4258bf27f1bfa11fb9c0a8315c61aa.tar.bz2 |
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
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions