Commit Graph

41 Commits

Author SHA1 Message Date
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
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
Nathan Broadbent
aa7dd471b5 Also expand args for git rebase x, where x is a shortcut to a branch 2012-12-15 08:49:28 +13:00
Nathan Broadbent
42a5832916 Added 'git tag' alias (gt) 2012-12-10 23:17:54 +13:00
Nathan Broadbent
cd4fb8b079 Added git push -f alias 2012-12-04 13:40:47 +13:00
Aljaž "g5pw" Srebrnič
a9aa363fdb Added initial zsh completion support to git_index
zsh now completes all arguments and all directories inside $GIT_REPO_DIR. This is till buggy because not all directories in $GIT_REPO_DIR are actual git projects. Next update will include completing the list in the .git_index file.
2012-10-23 09:13:20 +02:00
Nathan Broadbent
281131ef27 Added alias for git rebase -i 2012-10-20 17:31:23 +13:00
Nathan Broadbent
8f19f35b06 Fixed completion appending '//' when in a project's directory 2012-10-16 10:58:29 +13:00
Nathan Broadbent
f5d7d68291 Fix to preload Arch bash completion for git 2012-08-23 12:47:27 +12:00
Nathan Broadbent
760ca4eab7 Added gsm alias for git show --summary - handy to view the last commit SHA and message, without the changes 2012-08-22 20:48:36 +12:00
Nathan Broadbent
75e9a909a5 Revert "Changed _alias to alias_no_errors"
This reverts commit dba367d7f1.
2012-08-21 14:02:00 +12:00
Nathan Broadbent
dba367d7f1 Changed _alias to alias_no_errors 2012-08-21 12:28:15 +12:00
Nathan Broadbent
c08afca63f Support 'git branch' 2012-08-16 02:58:01 +12:00
Nathan Broadbent
b978b1bd43 Fall back to normal git branch, if any unknown args given. Also add aliases for git branch -a and -m 2012-08-16 02:53:52 +12:00
Nathan Broadbent
af84c992b7 Re-organized files. Added shortcuts for git branches, under gb function 2012-08-16 02:32:53 +12:00