Commit Graph

63 Commits

Author SHA1 Message Date
Jeff Byrnes
8761a4758b Add alias & default shortcut for git mergetool
Provides parity with the `gdt` alias for `git difftool`
2018-09-11 10:36:34 -04:00
David Lee
7189656854 [PATCH] Add grep_shortcuts
Closes #125, Thanks David Lee!
2018-08-31 09:33:37 -04:00
Tom "Ravi" Hale
70b4e62bb0 Remove -- from end of aliases 2018-08-18 14:35:43 +07:00
Antti Salminen
942f2bdd90 Expand arguments for git difftool. 2016-08-28 15:18:47 -04:00
Willa D
d804b2860e Merge pull request #206 from eballerini/apply-alias
added 'git apply' alias

Don't see a completely compelling case where `git apply` really benefits from having access to scm_breeze index shortcuts. `gapp` alias could be pruned in the future.
2016-08-28 15:09:44 -04:00
Wilhelmina Drengwitz
95c082c75c Merge branch 'jawshooah-submodule-update' 2016-08-28 14:46:41 -04:00
Nathan Broadbent
49dca42056 Remove "gh" alias 2016-08-17 15:00:51 +07:00
Emmanuel B
c655ace09c added 'git apply' alias 2016-07-06 07:53:18 -04:00
Nathan Broadbent
db85db81a9 Merge pull request #160 from jawshooah/pull-rebase
Add alias for "git pull --rebase"
2016-07-01 16:17:25 +07:00
Nathan Broadbent
a8c30f7351 Merge commit '40e91b8' 2016-05-14 22:38:59 +07:00
Nathan Broadbent
47a0b6c724 Add git whatchanged alias (gwc), thanks tjlevine (#196) 2016-05-14 22:31:55 +07:00
Nathan Broadbent
9f850c0dd0 Merge pull request #191 from aswin/master
Change gd to be 'git diff' without the two dashes. Add a new alias gd…
2016-05-14 22:29:18 +07:00
shinriyo
62d8df8371 top level path shortcut
top level path shortcut "gtop"
2016-03-16 18:09:42 +09:00
Aswinkumar Rajendiran
8086742768 Change gd to be 'git diff' without the two dashes. Add a new alias gdf for 'git diff --' 2015-10-14 18:09:28 -07:00
Nathan Broadbent
53aba36670 Fix issue with aliases that have no args 2015-06-16 17:20:29 +07:00
Armen Baghumian
5dd21beeea Fixes 'git fetch' and 'git checkout' liases, closes #176 2015-05-28 14:05:33 +00:00
Armen Baghumian
ff4ae7932d Fixed __git_alias bug in zsh 2015-05-26 12:46:11 +00:00
Nathan Broadbent
d288f3cd74 Fixed bug in __git_alias 2015-05-25 23:01:14 +07:00
Armen Baghumian
1ef06aa9cd Offset starts from 0 so the argument would be 3
This patch fixes broken aliases which have arguments (e.g. gap)
2015-05-21 04:09:57 +00:00
Stephan van Eijkelenburg
e9217f50ab Fixes #168 (zsh-problems)
This PR replaces `local varname=value` style declarations with `local varname; varname=value`. This solves #168 which caused troubles in zsh environments
2015-05-07 17:02:34 +02:00
Josh Hagins
40e91b81ff Add alias for git diff -w -- 2015-05-06 12:49:30 -04:00
Josh Hagins
9e24890de6 Add alias for git pull --rebase 2015-05-06 12:48:43 -04:00
Josh Hagins
d763faa68c Add aliases for submodule update 2015-05-06 12:48:11 -04:00
Josh Hagins
84b765eab9 Fix argument expansion in __git_alias 2015-01-20 22:38:49 -05:00
Nathan Broadbent
fef74e26a5 Added alias for git pull-request (hub) 2014-12-17 10:52:48 +06:00
Matthew Rothenberg
f14015fc3e aliases: consistent indentation and quotation
this is unrelated to the previous commit and zero functionality but
while I was changing things I wanted to clean up the indentation and
use consistent single quotes versus double quotes in the functions
calls for `_alias()` and `_git_alias()`.

In my opinion this makes the file more readable, but if it bothers you
let me know and I’ll be happy to remove it from the pull request.
2014-10-02 21:01:58 -04:00
Matthew Rothenberg
70c9501550 fix ability to undefine default aliases in zsh
The ability to not define default aliases in the `.git.scmbrc` file
leading to not having those aliases not present worked fine in bash.

However, this seems to still have thrown an error in zsh.  For example,
if you commented out the line:

        git_checkout_alias="gco"

then when sourcing scm_breeze aliases.sh would throw an error.

This applied only to aliases defined with the `_alias()` function and
not those with the `_git_alias()` function.

To fix this, I wrapped `_alias()` in a similar check to the one
`_git_alias()` has, where it passes the portions as arguments and
verifies the first is present before proceeding.

I'm not 100% certain why seperate functions exist for these two things
to begin with (as far as I can tell from a cursory examination the main
difference is `_git_aliases()` defines a tab completion?) but I believe
my change has fixed the ability to comment out aliases in `.git.scmbrc`
in zsh for users who do not want them (I'm in this boat, there are too
many for me and I get confused).

I tested manually in both bash and zsh and it appears to work, however
you might want to review this before merging given my relative
unfamiliarity with the codebase.
2014-10-02 20:42:43 -04:00
Matthew Rothenberg
1e9d60a06a gh is the new hub
`gh` is the new `hub`, rewritten to be fast and efficient.
http://owenou.com/gh/

If has been adopted by GitHub themselves and will replace `hub`
entirely, see:
https://github.com/github/hub/issues/475

This patch simply checks for `gh` as a possible `_git_cmd` in addition
to hub, restoring scm_breeze functionality for people who have switched
to gh.
2014-10-02 14:19:36 -04:00
Chas Ballew
413351a203 Fix upcoming Git 2.0 breaking change to git add -A. 2014-01-26 21:02:00 -05:00
Nathan Broadbent
878d81a4bd Fix git checkout,diff,reset,rm in deleted directories, if pwd is in git dir 2013-10-22 23:24:54 -07:00
Nathan Broadbent
dc8f8f1fdc Merge pull request #118 from AzizLight/pretty-git-log-all
Add an alias to show a git log with all the branches and remotes
2013-10-22 22:15:19 -07:00
Nathan Broadbent
ede87288e5 Merge pull request #115 from AzizLight/git-commit-verbose
Add an alias to `git commit --verbose`
2013-10-22 22:14:53 -07:00
Nathan Broadbent
9432e8c907 Merge pull request #110 from tuxinaut/master
Git merge aliases
2013-10-22 22:14:31 -07:00
Aziz Light
8d04265578 Add an alias to show a git log with all the branches and remotes 2013-10-20 17:34:27 +02:00
Nathan Broadbent
e2d98bc7c5 Merge pull request #107 from g5pw/master
Add ZSH completion support
2013-10-17 15:15:23 -07:00
Aziz Light
313cd4c1d2 Add an alias to git commit --verbose 2013-10-10 12:15:38 +01:00
Denny Schäfer
91b48718d1 Addd gmnff gmff alias for git merge --no-ff and --ff 2013-09-19 09:50:39 +02:00
Nathan Broadbent
e8c79f955c Added git stash pop alias (gashp) 2013-08-29 12:04:26 -07:00
Denny Schäfer
6f735020ae Add git merge to the expanded numeric commands 2013-08-26 13:08:24 +02:00
Aljaž "g5pw" Srebrnič
f81c243701 Merge branch 'master' of git://github.com/ndbroadbent/scm_breeze 2013-08-20 21:54:04 +02:00
Nathan Broadbent
9d5efbb7c5 Added gau alias for git add -u 2013-08-16 00:34:15 -07:00
Nathan Broadbent
a6a23b0a3d Re-add git reset to the expanded numeric commands 2013-08-15 23:47:10 -07:00
Nathan Broadbent
2541ef9817 Merge pull request #95 from cliffrowley/master
Add git difftool (default alias "gdt")
2013-07-15 20:01:57 -07:00
Nathan Broadbent
0ce8618d90 Added 'git_reset_last_commit' (grsl) alias, useful for undoing a temporary commit 2013-07-04 13:10:12 +12:00
Cliff Rowley
65e62a883b Add git difftool (default alias "gdt") 2013-07-02 16:00:54 +01:00
Abhishek Das
07518479a8 Adds git stash aliases 2013-07-01 18:19:03 +05:30
Marcin Bachry
123c17fa3b Make bash completions work with Ubuntu 13.04 2013-04-18 19:44:12 +02:00
Aljaž "g5pw" Srebrnič
7381978fe0 Merge branch 'master' of git://github.com/ndbroadbent/scm_breeze 2013-04-15 17:58:47 +02:00
Nathan Broadbent
adedf86971 No expand args for git reset 2013-02-03 13:35:59 +13:00
Andy Zhang
8ba76f1cbf Add "gdw" for git diff --word-diff
* Sometimes helpful to see changes inline
* Potential to tweak further with better regex (maybe detect similar char types so diff can be more granular)
2012-12-25 01:36:34 -08:00