flo/scm_breeze
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
460 Commits 1 Branch 0 Tags
9e24890de6a9f28939d8d06db572dd919a642900
Commit Graph

460 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Josh Hagins
9e24890de6 Add alias for git pull --rebase 2015-05-06 12:48:43 -04:00
Nathan Broadbent
d52ad497bc Merge pull request #162 from jawshooah/fix_git_alias 
Fix argument expansion in __git_alias
 2015-05-02 18:17:24 +07:00
Nathan Broadbent
9b9058ebc5 Merge pull request #164 from jeanblanchard/ls-aliases 
Make ls aliases optional
 2015-03-11 22:58:01 +06:00
Jean Blanchard
349896b0cf Make ls aliases optional 2015-03-06 09:41:31 +00:00
Josh Hagins
84b765eab9 Fix argument expansion in __git_alias 2015-01-20 22:38:49 -05:00
Nathan Broadbent
5ea1e69405 Added example gif 2014-12-27 21:31:10 +06:00
Nathan Broadbent
2194bb1fae gcob => gcb (alias for git checkout -b) 2014-12-17 10:55:35 +06:00
Nathan Broadbent
fef74e26a5 Added alias for git pull-request (hub) 2014-12-17 10:52:48 +06:00
Nathan Broadbent
885cc6fc12 Merge pull request #151 from mroth/zsh_undefine_alias_fix 
fix ability to undefine default aliases in zsh
 2014-10-04 21:38:22 -07: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
Nathan Broadbent
2908a3e397 Merge pull request #150 from mroth/gh 
`gh` is the new `hub`
 2014-10-02 11:27:12 -07: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
Nathan Broadbent
38aeef92e2 Merge pull request #148 from keen99/patch-2 
add a bit more detail around install.sh in readme
 2014-07-08 14:07:29 -07:00
keen99
ee450688fb add a bit more detail around install.sh in readme 
install.sh is really required, you can't just clone source and go.
 2014-07-08 17:04:31 -04:00
Nathan Broadbent
47111d274d Merge pull request #147 from keen99/patch-1 
_create_or_patch_scmbrc is not noclobber safe
 2014-07-08 13:09:40 -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
Nathan Broadbent
61a101176f Merge pull request #137 from ilkka/master 
Ensure C locale is used when processing command output
 2014-04-10 00:31:31 -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
Chas Ballew
413351a203 Fix upcoming Git 2.0 breaking change to git add -A. 2014-01-26 21:02:00 -05:00
Nathan Broadbent
7db526b295 Merge pull request #120 from sblask/fix-issue-119-show-more-information-in-gs 
Let gs handle commits the branch is behind
 2013-11-04 13:11:44 -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
Aziz Light
e8d2a23aa1 Add an example alias for git_commit_verbose_alias to git.scmbrc.example 2013-10-19 15:17:52 +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
Nathan Broadbent
6b9c9cae49 Updates to README 2013-09-27 15:10:02 -07:00
Nathan Broadbent
412528b54c Added additional info about list_alias commands 2013-09-27 15:08:05 -07:00
Nathan Broadbent
c0060c921b Merge pull request #113 from brianpeiris/patch-1 
Add note about other aliases.
 2013-09-27 14:57:04 -07:00
Brian Peiris
75cc24ab95 Add note about other aliases. 2013-09-27 15:21:12 -04: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
Nathan Broadbent
465bb26284 Merge pull request #106 from tuxinaut/master 
Add git merge to the expanded numeric commands
 2013-08-26 17:47:56 -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
Nathan Broadbent
22d0b3c476 Merge pull request #105 from galonsky/master 
Using git rev-parse --show-toplevel to find repo root
 2013-08-19 10:41:52 -07:00
Alex Galonsky
c37073cbc6 Using git rev-parse --show-toplevel to find repo root 2013-08-18 05:00:42 +00:00