#295 Add git_push_pull rule

README.md

@@ -169,7 +169,7 @@ using the matched rule and runs it. Rules enabled by default are as follows:
 * `git_pull` – sets upstream before executing previous `git pull`;
 * `git_pull_clone` – clones instead of pulling when the repo does not exist;
 * `git_push` – adds `--set-upstream origin $branch` to previous failed `git push`;
-* `git_push_force` – adds `--force` to a `git push`;
+* `git_push_pull` – runs `git pull` when `push` was rejected;
 * `git_stash` – stashes you local modifications before rebasing or switching branch;
 * `go_run` – appends `.go` extension when compiling/running Go programs
 * `grep_recursive` – adds `-r` when you trying to grep directory;
@@ -206,7 +206,8 @@ Enabled by default only on specific platforms:
 * `apt_get` – installs app from apt if it not installed;
 * `brew_install` – fixes formula name for `brew install`;
 * `brew_unknown_command` – fixes wrong brew commands, for example `brew docto/brew doctor`;
-* `brew_upgrade` – appends `--all` to `brew upgrade` as per Homebrew's new behaviour
+* `brew_upgrade` – appends `--all` to `brew upgrade` as per Homebrew's new behaviour;
+* `git_push_force` – adds `--force` to a `git push` (may conflict with `git_push_pull`);
 * `pacman` – installs app with `pacman` or `yaourt` if it is not installed.
 
 Bundled, but not enabled by default: