Staging
v0.8.1
Revision b200021e150320459d4f1edf1099131e0f5ae297 authored by Spencer E. Olson on 17 February 2011, 16:18:46 UTC, committed by Junio C Hamano on 17 February 2011, 20:25:17 UTC
Add two test cases in t7406 to ensure that the --merge/--rebase options
are ignored for "git submodule update" with new modules.  These test that
a simple checkout is performed instead.

Signed-off-by: Spencer E. Olson <olsonse@umich.edu>
Acked-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 1b4735d
History
File Mode Size
xdiff.h -rw-r--r-- 3.4 KB
xdiffi.c -rw-r--r-- 14.6 KB
xdiffi.h -rw-r--r-- 1.8 KB
xemit.c -rw-r--r-- 4.9 KB
xemit.h -rw-r--r-- 1.2 KB
xinclude.h -rw-r--r-- 1.2 KB
xmacros.h -rw-r--r-- 1.9 KB
xmerge.c -rw-r--r-- 15.1 KB
xpatience.c -rw-r--r-- 10.7 KB
xprepare.c -rw-r--r-- 11.2 KB
xprepare.h -rw-r--r-- 1.1 KB
xtypes.h -rw-r--r-- 1.6 KB
xutils.c -rw-r--r-- 8.1 KB
xutils.h -rw-r--r-- 1.7 KB

back to top