softwaredoug/idiot-proof-git
Idiot-proofing your git experience with git aliases. No extra tools, no fuss, just standardized, opinionated aliases for the 80% use case.
Intended for OSX users that use Github or Github Enterprise. Automagically uses the right 'trunk' for the situation - (upstream or origin, master or main...) - without you having to remember all that jazz.
Adds shortcuts for a rebase workflow. Assumes a 'trunk' of develompment at either origin or upstream remotes. Assumes Github and/or Github Enterprise.
Pushes local changes to the current branch at origin. Rejects if local branch is not up to date (ie your buddy made changes). See force-with-lease
Sync up current branch corresponding branch at trunkiest-trunk available. Either master or main. If you have 'upstream' it prefers the upstream, but falls back to origin.
Sync this branch with it's corresponding branch at origin. So if your buddy is working on this branch too, you can get their changes.
