global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-17 22:26:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
fc4045ee3eae49c829a466752da1937cfa13e048
git/submodule.c
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

12 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink