diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-24 19:16:26 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-24 19:16:26 (GMT) |
| commit | b30ccd757354ea09b41e4359b0a5ab429d12f02e (patch) | |
| tree | 171cf9a99a9fe390a98a2d6a500e2ff37b9f19eb /merge-tree.c | |
| parent | 288123f01cb1b835edbf6e2e188159c2ff858aca (diff) | |
| parent | 87cd09f43e56de5235d09aef3ff5d840419fef49 (diff) | |
| download | git-b30ccd757354ea09b41e4359b0a5ab429d12f02e.zip git-b30ccd757354ea09b41e4359b0a5ab429d12f02e.tar.gz git-b30ccd757354ea09b41e4359b0a5ab429d12f02e.tar.bz2 | |
Merge branch 'maint' of git://git.spearce.org/git-gui into maint
* 'maint' of git://git.spearce.org/git-gui:
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
Diffstat (limited to 'merge-tree.c')
0 files changed, 0 insertions, 0 deletions