summaryrefslogtreecommitdiff
path: root/git-merge-ours.sh
diff options
context:
space:
mode:
authorLibravatar Daniel Barkalow <barkalow@iabervon.org>2007-05-12 11:46:03 -0400
committerLibravatar Junio C Hamano <junkio@cox.net>2007-05-20 21:32:56 -0700
commit5d46c9d41febe5fe85f94f7db2b190d8abf1e71e (patch)
tree8673845865db89bf063eb51193233b47c119b027 /git-merge-ours.sh
parentMove refspec parser from connect.c and cache.h to remote.{c,h} (diff)
downloadtgif-5d46c9d41febe5fe85f94f7db2b190d8abf1e71e.tar.xz
Add handlers for fetch-side configuration of remotes.
These follow the pattern of the push side configuration, but aren't taken from anywhere else, because git-fetch is still in shell. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions