summaryrefslogtreecommitdiff
path: root/mailmap.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-01-24 11:18:05 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-01-24 11:18:05 -0800
commit01ddb1ff41cdbd98e257aa4c119a7d51a21f80be (patch)
treeae19f1b3672bac33ef724ffceb83a873f219c6bf /mailmap.c
parentWindows: Remove dependency on pthreadGC2.dll (diff)
parentMerge branch 'maint' of git://git.spearce.org/git-gui into maint (diff)
downloadtgif-01ddb1ff41cdbd98e257aa4c119a7d51a21f80be.tar.xz
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
Diffstat (limited to 'mailmap.c')
0 files changed, 0 insertions, 0 deletions