scatterd-dotfiles/bin/git-merge-branch

#!/bin/sh

set -e

git fetch origin
line_count=$(git diff origin/master..master | wc -l)

if [ $line_count -gt 0 ]; then
  printf "failed: master is not up to date with origin/master\n"
  exit 1
fi

git checkout master
git merge "@{-1}"
Move Git aliases to subcommand scripts Any executable script on you PATH that is named `git-some-name` will be available as a git subcommand, which means you could do `git some-name` to run the script. Git adds them to `git help -a` under the title "git commands available from elsewhere on your $PATH", which will then power the auto completion, so that will also work for any command you add. http://blog.zamith.pt/blog/2014/11/05/supercharging-your-git/ Examples of other projects that structure their dotfiles like this: https://github.com/robbyrussell/oh-my-zsh https://github.com/tj/git-extras https://github.com/holman/dotfiles 2015-04-11 18:57:50 -07:00			`#!/bin/sh`

			`set -e`

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			`git fetch origin`
			`line_count=$(git diff origin/master..master \| wc -l)`

			`if [ $line_count -gt 0 ]; then`
			`printf "failed: master is not up to date with origin/master\n"`
			`exit 1`
			`fi`

Move Git aliases to subcommand scripts Any executable script on you PATH that is named `git-some-name` will be available as a git subcommand, which means you could do `git some-name` to run the script. Git adds them to `git help -a` under the title "git commands available from elsewhere on your $PATH", which will then power the auto completion, so that will also work for any command you add. http://blog.zamith.pt/blog/2014/11/05/supercharging-your-git/ Examples of other projects that structure their dotfiles like this: https://github.com/robbyrussell/oh-my-zsh https://github.com/tj/git-extras https://github.com/holman/dotfiles 2015-04-11 18:57:50 -07:00			`git checkout master`
			`git merge "@{-1}"`