aboutsummaryrefslogtreecommitdiff
path: root/git-merge-ours.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-09-09 22:42:02 -0700
committerJunio C Hamano <junkio@cox.net>2006-09-10 13:39:25 -0700
commite0ffb24877d4530208905512f7c91dd8d71e2c95 (patch)
treedf9d8046b159c0b2418e2a04c9eacb007517a936 /git-merge-ours.sh
parent8142f603b9955648228549d2e83ace7fbe834114 (diff)
downloadgit-e0ffb24877d4530208905512f7c91dd8d71e2c95.tar.gz
git-e0ffb24877d4530208905512f7c91dd8d71e2c95.tar.xz
Add --verbose to git-archive
And teach backends about it. Signed-off-by: Junio C Hamano <junkio@cox.net> (cherry picked from 9e2c44a2893ae90944a0b7c9f40a9d22b759b5c0 commit)
Diffstat (limited to 'git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions