diff --git a/git_common.py b/git_common.py
index 7ff03b7fc5..4add1782b9 100644
--- a/git_common.py
+++ b/git_common.py
@@ -448,7 +448,7 @@ def freeze():
   # will be set to true if there are any indexed files to commit.
   have_indexed_files = False
 
-  for f, s in status():
+  for f, s in status(ignore_submodules='all'):
     if is_unmerged(s):
       die("Cannot freeze unmerged changes!")
     if s.lstat not in ' ?':
diff --git a/git_freezer.py b/git_freezer.py
index afcfb750ff..e4b1d8b162 100755
--- a/git_freezer.py
+++ b/git_freezer.py
@@ -12,7 +12,7 @@ from git_common import freeze, thaw
 
 
 def CMDfreeze(parser, args):
-  """Freeze a branch's changes."""
+  """Freeze a branch's changes, excluding unstaged gitlinks changes."""
   parser.parse_args(args)
   return freeze()