search

kieranpotts / dotfiles

My UNIX dotfiles.
MIT License
1 stars 0 forks source link

Git "merge" aliases #238

Open kieranpotts opened 1 year ago

kieranpotts commented 1 year ago

Source: https://www.durdn.com/blog/2012/11/22/must-have-git-aliases-advanced-examples/

Shortcuts to merge stuff:

ours = "!f() { git checkout --ours $@ && git add $@; }; f"
theirs = "!f() { git checkout --theirs $@ && git add $@; }; f"