scatterd-dotfiles/bin
Geoff Harcourt 0786549686 merge-branch: exit 1 if origin and local differ
This change prevents chained commands from continuing execution if the
`git merge` is operation would be unsuccessful such as a common
operation when a feature branch is ready to be merged and pushed:

```
git merge-branch && git push origin
```

If the origin/master and the local master have any difference, we return
status 1 and stop execution rather then emit a false success.

h/t: @croaky

Fix #563.
2017-12-18 22:51:13 -05:00
..
bundler-search Fix minor spelling error in command code comment 2015-10-21 08:19:17 -04:00
git-ca Bring more shell syntax into shellcheck compliance 2015-10-30 12:50:02 -04:00
git-co-pr Move Git aliases to subcommand scripts 2015-04-27 13:47:52 -07:00
git-create-branch Move Git aliases to subcommand scripts 2015-04-27 13:47:52 -07:00
git-ctags Move Git aliases to subcommand scripts 2015-04-27 13:47:52 -07:00
git-current-branch Move Git aliases to subcommand scripts 2015-04-27 13:47:52 -07:00
git-delete-branch Move Git aliases to subcommand scripts 2015-04-27 13:47:52 -07:00
git-merge-branch merge-branch: exit 1 if origin and local differ 2017-12-18 22:51:13 -05:00
git-pr Move Git aliases to subcommand scripts 2015-04-27 13:47:52 -07:00
git-rename-branch Move Git aliases to subcommand scripts 2015-04-27 13:47:52 -07:00
git-trust-bin Add bin/git-trust-bin command 2017-08-25 09:28:16 -04:00
git-up Move Git aliases to subcommand scripts 2015-04-27 13:47:52 -07:00
replace Overwrite internal field separator when replacing. 2016-04-15 10:36:33 -04:00
tat Revert accidental merge from fork (#571) 2017-11-17 16:36:59 -08:00