A little todo note before I forget it :), based on a suggestion from Lars.

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index ca6c62380990268a77a54bc7655c055445469b94..70366ff8c06bb96adc8795a11df1ab4f319b737d 100755 (executable)
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -7,6 +7,8 @@
 #            2007 Trolltech ASA
 # License: MIT <http://www.opensource.org/licenses/mit-license.php>
 #
+# TODO: Add an option to sync/rebase to fetch and rebase from origin first.
+#
 
 import optparse, sys, os, marshal, popen2, subprocess, shelve
 import tempfile, getopt, sha, os.path, time, platform