| commit | d94f6f3ccf2ccff405a7ca894060d1dcc5a66e8d | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 11 Apr 2011 22:57:11 +0000 (11 15:57 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 11 Apr 2011 22:57:11 +0000 (11 15:57 -0700) | ||
| tree | 7611ce94daf3d6fb5d73bab88e95d1312b773fe0 | treesnapshot (tar.gz zip) |
| parent | 91045456c1201566412998c660ba0d2e2e17b9fb | commitdiff |
| parent | 9db31bdf5c834689c826f809d6d15bf7ab8d3598 | commitdiff |
Merge branch 'nm/submodule-update-force' into next
* nm/submodule-update-force:
submodule: Add --force option for git submodule update
Conflicts:
t/t7406-submodule-update.sh
* nm/submodule-update-force:
submodule: Add --force option for git submodule update
Conflicts:
t/t7406-submodule-update.sh
| Documentation/git-submodule.txt | diff1 | diff2 | blobhistory |
| git-submodule.sh | diff1 | diff2 | blobhistory |
| t/t7406-submodule-update.sh | diff1 | diff2 | blobhistory |