X-Git-Url: https://git.cworth.org/git?p=nogit;a=blobdiff_plain;f=nogit;fp=nogit;h=212ca33094e7c0af1f4fac7070747dab96f2a14c;hp=b9a248e3f638ad9e2a203a1b8f77dd47601b4454;hb=799687bcb9c7d6bc66b0dfd8b84fdb0942a30c13;hpb=d770602343c5f9be8064c38bb46370246ff950ff

diff --git a/nogit b/nogit
index b9a248e..212ca33 100755
--- a/nogit
+++ b/nogit
@@ -103,7 +103,17 @@ nogit_clone()
 
 nogit_sync()
 {
-    echo "Internal error: 'nogit sync' not yet implemented"
+    # First commit any locally modified nogit files
+    GIT_DIR=$NOGIT_DIR git commit -a -m "nogit-sync commit" >/dev/null 2>&1 || true
+
+    # Then, fetch and merge any upstream changes
+    GIT_DIR=$NOGIT_DIR git fetch >/dev/null 2>&1
+    GIT_DIR=$NOGIT_DIR git merge -m "nogit-sync merge" >/dev/null 2>&1
+
+    # Finally, push any new commits up to the upstream repository
+    GIT_DIR=$NOGIT_DIR git push >/dev/null 2>&1
+
+    echo "Completed nogit sync"
 }
 
 if [ $# -lt 1 ]; then