diff options
| author | Nikolai Aleksandrovich Pavlov <kp-pav@yandex.ru> | 2017-05-08 21:29:58 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-08 21:29:58 +0300 |
| commit | a9981e0e7e9439340bb8c0162f860b78d8002559 (patch) | |
| tree | c9b0cc3229d498abca65ddb0c3e4753fb5e2c5ce | |
| parent | e7a4d95a9e4765ec9338640e480b88c86a082fba (diff) | |
| parent | b4f0586596cb4c5cea77a1bbca5cb3a479f2b910 (diff) | |
| download | rneovim-a9981e0e7e9439340bb8c0162f860b78d8002559.tar.gz rneovim-a9981e0e7e9439340bb8c0162f860b78d8002559.tar.bz2 rneovim-a9981e0e7e9439340bb8c0162f860b78d8002559.zip | |
Merge pull request #6701 from ZyX-I/fix-ri-alias
CONTRIBUTING.md: Fix ri alias
| -rw-r--r-- | CONTRIBUTING.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f442ceb672..755d35e559 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -43,7 +43,7 @@ Pull requests ("PRs") - Use the `ri` git alias: ``` [alias] - ri = "!sh -c 't=\"${1:-master}\" ; s=\"${2:-HEAD}\" ; if git merge-base --is-ancestor \"$t\" \"$s\" ; then o=\"$t\" ; else mb=\"$(git merge-base \"$t\" \"$s\")\" ; if test \"x$mb\" = x ; then o=\"$t\" ; else lm=\"$(git log -n1 --merges \"$t..$s\" --pretty=%H)\" ; if test \"x$lm\" = x ; then o=\"$mb\" ; else o=\"$lm\" ; fi ; fi ; fi ; [ $# -gt 0 ] && shift ; [ $# -gt 0 ] && shift ; git rebase --interactive \"$o\" \"$@\"' -" + ri = "!sh -c 't=\"${1:-master}\"; s=\"${2:-HEAD}\"; mb=\"$(git merge-base \"$t\" \"$s\")\"; if test \"x$mb\" = x ; then o=\"$t\"; else lm=\"$(git log -n1 --merges \"$t..$s\" --pretty=%H)\"; if test \"x$lm\" = x ; then o=\"$mb\"; else o=\"$lm\"; fi; fi; test $# -gt 0 && shift; test $# -gt 0 && shift; git rebase --interactive \"$o\" \"$@\"'" ``` This avoids unnecessary rebases yet still allows you to combine related commits, separate monolithic commits, etc. |