Skip to content

Instantly share code, notes, and snippets.

@tjarksaul
Forked from steve-jansen/git-update
Last active February 10, 2023 13:06
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save tjarksaul/7a513d6e653c950fdd9030a4375e2fcf to your computer and use it in GitHub Desktop.
Save tjarksaul/7a513d6e653c950fdd9030a4375e2fcf to your computer and use it in GitHub Desktop.
A custom script for git to stash any working changes, pull origin main, and unstash your working changes
#!/bin/bash
stash() {
# check if we have uncommited changes to stash
git status --porcelain | grep "^." >/dev/null;
if [ $? -eq 0 ]
then
if git stash save -u "git-update on `date`";
then
stash=1;
fi
fi
}
unstash() {
# check if we have uncommited change to restore from the stash
if [ $stash -eq 1 ]
then
git stash pop;
fi
}
stash=0;
stash;
git pull --rebase origin main;
unstash;
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment