diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-05-20 15:45:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-20 15:45:35 -0700 |
| commit | adc7052bb6e737cec0c6702f8dde259540eab672 (patch) | |
| tree | 9a3bfa9ff1389908213adcbddedfa09bf8b88c7b /unpack-trees.c | |
| parent | 9de96815493b577ae791d5113a3e354142ffbcae (diff) | |
| parent | cb8ad289c6b3f774e6e4431a08eb585eadbb8dad (diff) | |
| download | git-adc7052bb6e737cec0c6702f8dde259540eab672.tar.gz | |
Merge branch 'maint'
By Jens Lehmann (1) and Johannes Sixt (1)
* maint:
Consistently use "superproject" instead of "supermodule"
t3404: begin "exchange commits with -p" test with correct preconditions
Diffstat (limited to 'unpack-trees.c')
| -rw-r--r-- | unpack-trees.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index bcee99c52e..ad40109432 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -1210,7 +1210,7 @@ static int verify_uptodate_1(struct cache_entry *ce, return 0; /* * NEEDSWORK: the current default policy is to allow - * submodule to be out of sync wrt the supermodule + * submodule to be out of sync wrt the superproject * index. This needs to be tightened later for * submodules that are marked to be automatically * checked out. |