aboutsummaryrefslogtreecommitdiff
path: root/git-merge-ours.sh
diff options
context:
space:
mode:
authorJakub Narebski <jnareb@gmail.com>2007-06-16 21:03:45 +0200
committerJunio C Hamano <gitster@pobox.com>2007-06-16 13:08:09 -0700
commit6da08783022ab7e54fcf63c55ea7a52bd3900b99 (patch)
tree08488d4d940ddac6c1b1819e733fad79c1af6d90 /git-merge-ours.sh
parent29a6c3f8046ca2de39958a1e9fa93d4afc9461bf (diff)
downloadgit-6da08783022ab7e54fcf63c55ea7a52bd3900b99.tar.gz
git-6da08783022ab7e54fcf63c55ea7a52bd3900b99.tar.xz
Document git read-tree --trivial
Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions