summaryrefslogtreecommitdiffstats
path: root/git-merge-ours.sh
diff options
context:
space:
mode:
authorAlex Riesen <raa.lkml@gmail.com>2007-03-25 01:55:43 +0100
committerJunio C Hamano <junkio@cox.net>2007-03-25 07:32:55 +0200
commit2a18c266d04273be05ed29c589a5c29b8e68134d (patch)
tree5801e06d8d8cf1571bef97700ef5c5e0adb0833c /git-merge-ours.sh
parentwrite_sha1_from_fd() should make new objects read-only (diff)
downloadgit-2a18c266d04273be05ed29c589a5c29b8e68134d.tar.xz
git-2a18c266d04273be05ed29c589a5c29b8e68134d.zip
Document --quiet option to git-diff
Signed-off-by: Alex Riesen <raa.lkml@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