flo/scm_breeze
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
667 Commits 1 Branch 0 Tags
fd4096ed98e03a5552b01b06662046f153a275a1
Commit Graph

427 Commits

Author SHA1 Message Date
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
Nathan Broadbent
bda4fab9bd Merge pull request #145 from aero-z/fix-rename-modify 
Don't show oldname -> newname for unstaged modifications
 2014-07-23 23:12:14 -07:00
keen99
a1afeef0c4 make _create_or_patch_scmbrc noclobber safe 
use >| instead of > to override noclobber on write (works for both bash and zsh)
 2014-07-08 16:01:58 -04:00
aero-z
ee5c1e5aa0 Changing the output for git status when there is a rename and modify at the same time 2014-06-12 02:47:56 -04:00
Nathan Broadbent
3e09624f8a Merge pull request #131 from chasballew/git_add_all_deprecation_fix 
Fix upcoming Git 2.0 breaking change to `git add -A`.
 2014-04-10 00:32:10 -07:00
Test User
65088ce716 Ensure C locale is used when processing command output 
This change makes sure LC_MESSAGES is set to C whenever command output
is run through grep, sed etc. Otherwise aliasing will fail whenever
localized messages are printed.

This should fix #98 and #64.
 2014-04-08 13:21:16 +03:00
LFDM
fe1d4435a7 Refactor, commenting, polishing. 2014-01-29 22:53:20 +01:00
LFDM
33b561ebc1 status_shortcuts.rb completely rewritten 2014-01-29 21:05:24 +01:00
Chas Ballew
413351a203 Fix upcoming Git 2.0 breaking change to git add -A. 2014-01-26 21:02:00 -05:00
David Lee
6860d114fc Fix shortcuts offset when branch_shortcuts encounters detached HEAD (fixes #127) 2013-12-20 00:30:52 -08:00
Sebastian Blask
b7fa37e1f1 Let gs handle commits the branch is behind 
Fixes #119
 2013-10-30 17:39:23 +01: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
b224f49850 determine extended regex argument for sed, can be -E or -r (fix #112) 2013-10-22 22:28:39 -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č
0de1579dc4 No need to have semicolons 2013-08-20 23:03:34 +02:00
Aljaž "g5pw" Srebrnič
18fe0accf1 Complete commands when using batch-cmd 2013-08-20 23:03:01 +02:00
Aljaž "g5pw" Srebrnič
9f548c4175 Basic zsh completion for git_index 
The script now completes all projects in the index and all files in GIT_PROJECTS
directory.
 2013-08-20 22:35:16 +02:00
Aljaž "g5pw" Srebrnič
025351c486 Change completion title 
It makes more sense to name the category 'Git projects' instead of 'Project
name'.
 2013-08-20 22:30:16 +02:00
Aljaž "g5pw" Srebrnič
7194283dfa Declare local variables 
Since we are using the _arguments helper, we need to define some local
variables in order to avoid altering the global environment.
 2013-08-20 22:28:22 +02:00
Aljaž "g5pw" Srebrnič
f81c243701 Merge branch 'master' of git://github.com/ndbroadbent/scm_breeze 2013-08-20 21:54:04 +02:00
Alex Galonsky
c37073cbc6 Using git rev-parse --show-toplevel to find repo root 2013-08-18 05:00:42 +00:00
Nathan Broadbent
9d5efbb7c5 Added gau alias for git add -u 2013-08-16 00:34:15 -07:00
Nathan Broadbent
b765b00776 Wait... they should be a maximum of 4 digits. 2013-08-15 23:55:12 -07:00
Nathan Broadbent
726b864785 $e{*} variables should be a maximum of 3 digits 2013-08-15 23:53:40 -07:00
Nathan Broadbent
a6a23b0a3d Re-add git reset to the expanded numeric commands 2013-08-15 23:47:10 -07:00
Nathan Broadbent
e9f3fd7a7c Fix git_commit_all for OSX 2013-07-22 20:33:23 -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
c575f171c2 Fixed case-insensitive matching... my last commit was pretty dumb 2013-07-09 20:10:57 +12:00
Nathan Broadbent
697a636e10 repo_index should be case insensitive 2013-07-09 19:49:35 +12: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
Nathan Broadbent
b3661b108a Merge pull request #89 from siasia/master 
Fix gb -D expansion
 2013-07-01 14:39:49 -07:00
Abhishek Das
07518479a8 Adds git stash aliases 2013-07-01 18:19:03 +05:30
Artyom Olshevskiy
3ee5517d82 Fix gb -D expansion 2013-05-31 18:46:32 +03:00
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
Giuseppe Rota
d9351f82c4 Conditional git branch aliases definition 2013-03-12 22:35:42 +01:00
Nathan Broadbent
adedf86971 No expand args for git reset 2013-02-03 13:35:59 +13:00
Nathan Broadbent
dd10be79e2 Re-wrap functions as functions. Fixes issue with RVM reload (cd wrapper will be overwritten without error) 2013-01-30 22:29:05 +13:00
Nathan Broadbent
5b7a2c4307 Ensure SCM Breeze is loaded after RVM when wrapping the cd command 2013-01-30 12:05:40 +13:00
Nathan Broadbent
d1a9df3844 Added keyboard shortcut to append [ ci skip ] to commit message when committing all files 2013-01-30 11:05:59 +13:00