![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 24 Jan 2010 19:18:05 +0000 (11:18 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 24 Jan 2010 19:18:05 +0000 (11:18 -0800) | ||
| commit | 01ddb1ff41cdbd98e257aa4c119a7d51a21f80be | |
| tree | ae19f1b3672bac33ef724ffceb83a873f219c6bf | tree | snapshot |
| parent | 767f8b31cb3becbe303eb50a3faf3b4753fbaddd | commit | diff |
| parent | b30ccd757354ea09b41e4359b0a5ab429d12f02e | commit | diff |
Merge branch 'maint'
* maint:
git-gui: work from the .git dir
git-gui: Fix applying a line when all following lines are deletions
git-gui: Correct file_states when unstaging partly staged entry
git-gui: Fix gitk for branch whose name matches local file
git-gui: Keep repo_config(gui.recentrepos) and .gitconfig in sync
git-gui: handle really long error messages in updateindex.
git-gui: Add hotkeys for "Unstage from commit" and "Revert changes"
git-gui: Makefile: consolidate .FORCE-* targets
* maint:
git-gui: work from the .git dir
git-gui: Fix applying a line when all following lines are deletions
git-gui: Correct file_states when unstaging partly staged entry
git-gui: Fix gitk for branch whose name matches local file
git-gui: Keep repo_config(gui.recentrepos) and .gitconfig in sync
git-gui: handle really long error messages in updateindex.
git-gui: Add hotkeys for "Unstage from commit" and "Revert changes"
git-gui: Makefile: consolidate .FORCE-* targets