summaryrefslogtreecommitdiff
path: root/git-merge-ours.sh
diff options
context:
space:
mode:
authorMarco Costalba <mcostalba@gmail.com>2006-03-04 07:42:09 +0100
committerJunio C Hamano <junkio@cox.net>2006-03-03 23:29:56 -0800
commited19f367220a50e4e2a5c1a00b03c14eafcaba89 (patch)
treed50ffac920baa4d849c542bdb8523d349ae716b4 /git-merge-ours.sh
parent91a6bf468230d63c414a21adeef94f1242eaaaab (diff)
downloadgit-ed19f367220a50e4e2a5c1a00b03c14eafcaba89.tar.gz
Add a Documentation/git-tools.txt
A brief survey of useful git tools, including third-party and external projects. Signed-off-by: Marco Costalba <mcostalba@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions