• Junio C Hamano's avatar
    Merge branch 'hv/submodule-find-ff-merge' · 2d984464
    Junio C Hamano authored
    * 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
    2d984464
path.c 17.5 KB