start:
if (no current task) goto New Task
Old Task: gco <branch-name
goto work
New Task: gcb <branch-name>
work:
(... bunch of typing here...)
Quick check: gst
Add All: gaa
Then commit: gc
if (not finished or no urge to backup everything online) goto work
push:
Push using the local branch name: ggpush
if (no conflicts) goto finish
Resolve conflict with master: gm master
(I used neovim and fugitive to resolve the actual conflict)
go to push
finish:
back to master: gco master
Pull all changes: gl
if (not end of day) goto start
oh-my-zsh with the git plugin for the aliases
For further actions, you may consider blocking this person and/or reporting abuse
We're a place where coders share, stay up-to-date and grow their careers.
start:
if (no current task) goto
New Task
Old Task:
gco <branch-name
goto
work
New Task:
gcb <branch-name>
work:
(... bunch of typing here...)
Quick check:
gst
Add All:
gaa
Then commit:
gc
if (not finished or no urge to backup everything online) goto
work
push:
Push using the local branch name:
ggpush
if (no conflicts) goto
finish
Resolve conflict with master:
gm master
(I used neovim and fugitive to resolve the actual conflict)
go to
push
finish:
back to master:
gco master
Pull all changes:
gl
if (not end of day) goto
start
oh-my-zsh with the git plugin for the aliases