Junio C Hamano 2d984464c6 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

2010-08-21 23:27:59 -07:00

18 KiB

Raw Blame History

View Raw