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