This repository contains a collection of bash scripts to use with git. The primary script is the "gup" script, which is useful in a variety of workflows and its purpose is described below. Many of the other scripts are simply shorthand aliases of single commands. These scripts assume that the name of your remote is "origin", although this can easily be changed.
Clone the repo to your folder of choice and add the aliases to your .gitconfig:
[alias]
gup = !C:/path/to/the/scripts/gup.sh
changelog = !C:/path/to/the/scripts/changelog.sh
mnf = !C:/path/to/the/scripts/mnf.sh
co = !C:/path/to/the/scripts/co.sh
cob = !C:/path/to/the/scripts/cob.sh
f = !C:/path/to/the/scripts/f.sh
resync = !C:/path/to/the/scripts/resync.sh
ss = !C:/path/to/the/scripts/ss.sh
sss = !C:/path/to/the/scripts/sss.sh
sp = !C:/path/to/the/scripts/sp.sh
sl = !C:/path/to/the/scripts/sl.sh
sd = !C:/path/to/the/scripts/sd.sh
bd = !C:/path/to/the/scripts/bd.sh
bdd = !C:/path/to/the/scripts/bdd.sh
bm = !C:/path/to/the/scripts/bm.sh
It's also advisable, but not required, to enable rerere to assist with conflicts:
[rerere]
enabled = true
Gup's purpose is to easily integrate changes from the remote repository into your local tracking branches. It's result is similar to, but different from, Jason Weathered's gup and Aanand Prasad's git-up. You can use the script in 3 ways...
git gup [branch-name]
Use this command to update a main branch, or to update a feature branch that you are collaborating on but are not the owner of. This command will stash your working tree, fetch changes from the remote repository and rebase your local commits on top of the latest changes from the remote with the --preserve-merges flag set. If a stash save was necessary and if the rebase was successful, it will pop the stash before completing.
git gup development
OR
git gup [feature-branch] [main-branch]
Use this command if you have a local feature branch that has not been pushed to the remote repository. This command will stash your working tree, fetch changes from the remote repository, and rebase your local commits on top of the latest changes from the remote with the --preserve-merges flag set for the specified main-branch only. It will then rebase your local feature branch onto the specified main branch. If a stash save was necessary and if the rebase was successful, it will pop the stash before completing.
git gup feature-addValidationToNewUserForm development
OR
git gup --update-both [feature-branch] [main-branch]
Use this command if you have a feature branch that has been pushed to the remote repository and you are the feature branch owner. This command works similar to those listed above, but it will integrate any changes from the remote main branch into your local tracking branch, then integrate changes from the remote feature branch into your local tracking branch, and finally replay the feature branch on top of the main branch. It is important to note that this command requires a git push with the --force flag set, which the script will prompt you to perform at the end of successful rebasing. If the script is unsuccessful, you will need to do this yourself. If a stash save was necessary and if the rebase was successful, it will pop the stash before completing
git gup --update-both feature-addValidationToNewUserForm development
Shortcut to git merge --no-ff command.
git mnf [feature-branch-name] [trunk-branch-name]
OR
git mnf feature-addValidationToNewUserForm development