Merge branch 'hv/submodule-find-ff-merge'
commit2d984464c6be7ced6772a8dcf95d6a461a659a78
authorJunio C Hamano <gitster@pobox.com>
Sun, 22 Aug 2010 06:27:59 +0000 (21 23:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 22 Aug 2010 06:27:59 +0000 (21 23:27 -0700)
treeebde8778f17609acc0587524636ec4862c065ca9
parentd25c72f7da5116f7b7a1f88a59d2bc14415a03b2
parent68d03e4a6e448aa557f52adef92595ac4d6cd4bd
Merge branch 'hv/submodule-find-ff-merge'

* hv/submodule-find-ff-merge:
  Implement automatic fast-forward merge for submodules
  setup_revisions(): Allow walking history in a submodule
  Teach ref iteration module about submodules

Conflicts:
submodule.c
cache.h
merge-recursive.c
path.c
refs.c
submodule.c
submodule.h