diff --git a/git_common.py b/git_common.py
index 0a984aeb8..3fea740d5 100644
--- a/git_common.py
+++ b/git_common.py
@@ -847,8 +847,8 @@ def is_dirty_git_tree(cmd):
 
   dirty = get_dirty_files()
   if dirty:
-    w('Cannot %s with a dirty tree. Commit, freeze or stash your changes first.'
-      % cmd)
+    w('Cannot %s with a dirty tree. Commit%s or stash your changes first.' %
+      (cmd, '' if cmd == 'upload' else ', freeze'))
     w('Uncommitted files: (git diff-index --name-status HEAD)')
     w(dirty[:4096])
     if len(dirty) > 4096: # pragma: no cover