Junio C Hamano a49eb197d8 Merge branch 'ph/submodule-rebase' ...

* ph/submodule-rebase:
  git-submodule: add support for --merge.

Conflicts:
	Documentation/git-submodule.txt
	git-submodule.sh

2009-06-20 21:51:13 -07:00

16 KiB

Executable File

Raw Blame History

View Raw