summaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-01-07 10:17:52 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-01-08 05:36:35 (GMT)
commit4b441f47cefe7f4861167a151a395606e1a16745 (patch)
tree745a824bf251e485fc6bd6649bddc992b395994c /git-merge.sh
parent7d1864ce67d83485cf5cbc8c90fc170ee884ef16 (diff)
downloadgit-4b441f47cefe7f4861167a151a395606e1a16745.zip
git-4b441f47cefe7f4861167a151a395606e1a16745.tar.gz
git-4b441f47cefe7f4861167a151a395606e1a16745.tar.bz2
git-fetch: allow updating the current branch in a bare repository.
Sometimes, people have only fetch access into a bare repository that is used as a back-up location (or a distribution point) but does not have a push access for networking reasons, e.g. one end being behind a firewall, and updating the "current branch" in such a case is perfectly fine. This allows such a fetch without --update-head-ok, which is a flag that should never be used by end users otherwise. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge.sh')
0 files changed, 0 insertions, 0 deletions