summaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-02-22 19:20:08 -0800
committerLibravatar Junio C Hamano <junkio@cox.net>2006-02-22 19:20:08 -0800
commitab8c9fe256a21413f86080082cf65b6f7c7656b3 (patch)
tree53e3ef858e207561b55c6ce00710d64b233ed5f5 /git-merge.sh
parentgit-rm: Fix to properly handle files with spaces, tabs, newlines, etc. (diff)
parentUse Ryan's git-annotate instead of jsannotate (diff)
downloadtgif-ab8c9fe256a21413f86080082cf65b6f7c7656b3.tar.xz
Merge branch 'ra/anno'
* ra/anno: Use Ryan's git-annotate instead of jsannotate Add git-annotate, a tool for assigning blame.
Diffstat (limited to 'git-merge.sh')
0 files changed, 0 insertions, 0 deletions