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

561 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nathan Broadbent
a8c30f7351 Merge commit '40e91b8' 2016-05-14 22:38:59 +07:00
Nathan Broadbent
da0af808d0 Merge pull request #185 from patbl/master 
exec_scmb_expand_args: Escape ampersands.
 2016-05-14 22:33:26 +07:00
Nathan Broadbent
116ee8d7f0 Merge pull request #188 from brianpeiris/patch-2 
Add table of contents to README
 2016-05-14 22:32:49 +07:00
Nathan Broadbent
2d5d404f66 Merge pull request #197 from tjlevine/noclobber-fix 
Use >| operator in _rebuild_git_index when overwriting .git_index file
 2016-05-14 22:32:25 +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
Nathan Broadbent
987da4d6a2 Skip env variables for git branch if there are more than 300 branches 2016-05-14 22:27:04 +07:00
Nathan Broadbent
67de7a682b Merge pull request #198 from shinriyo/patch-2 
gtop shortcut
 2016-05-14 22:12:01 +07:00
Nathan Broadbent
2e10cedb20 Merge pull request #199 from shinriyo/patch-1 
top level path shortcut
 2016-05-14 22:11:56 +07:00
Nathan Broadbent
ffee5c54e5 Merge pull request #203 from brianpeiris/bugfix/babun-zsh-infinite-loop 
Fix infinite loop in shell with babun (cygwin)
 2016-05-14 22:11:29 +07:00
Nathan Broadbent
472a24e1c5 Added maintenance notice 2016-05-14 22:10:22 +07:00
Brian Peiris
0d80de33e6 Fix infinite loop in shell with babun (cygwin) 2016-04-11 05:10:36 -04:00
shinriyo
39609d3427 gtop shortcut 
gtop shortcut
 2016-03-16 18:10:30 +09:00
shinriyo
62d8df8371 top level path shortcut 
top level path shortcut "gtop"
 2016-03-16 18:09:42 +09:00
Tyler Levine
747b60cf37 Use >| operator in _rebuild_git_index when overwriting .git_index file 
If the shell has the noclobber option set, s --rebuild will fail to
update the .git_index file. Using the >| operator instead of the >
operator forces the .git_index file to be clobbered, which is the
desired behavior.
 2016-03-14 12:56:15 -07:00
Nathan Broadbent
b6531e8379 Merge pull request #193 from zackzachariah/master 
Support for OS X .bash_profile + install logging
 2015-12-09 01:31:42 +07:00
Zack Sheppard
65daecb0c7 Support for OS X .bash_profile + install logging 
Adds support for OS X's default bash configuration file,
~/.bash_profile, and more logging during install about
which file, if any, got the source line added.
 2015-11-28 12:34:44 -05: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
Brian Peiris
5fb222912d Add table of contents to README 
The README has gotten quite large. Adding a table of contents might help, especially if you're just looking for the installation section. Generated using DocToc: https://github.com/thlorenz/doctoc
 2015-09-09 12:36:17 -04:00
Brian Peiris
56640c0e4d Add note about ruby in installation section. 2015-09-09 12:26:36 -04:00
Patrick Brinich-Langlois
6e28eb645a exec_scmb_expand_args: Escape ampersands. 2015-08-23 21:51:27 -07:00
Nathan Broadbent
53aba36670 Fix issue with aliases that have no args 2015-06-16 17:20:29 +07:00
Nathan Broadbent
07267f5826 Merge pull request #179 from Interfere/patch-1 
Fix setting alias for "_scmb_git_branch_shortcuts"
 2015-06-16 17:17:33 +07:00
Alexey Komnin
71f3086df9 Fix setting alias for "_scmb_git_branch_shortcuts" 
__git_alias expects three arguments. Passing two arguments to __git_alias for "gb" leads to undesirable behaviour on some platforms.
 2015-06-03 11:47:14 +03:00
Nathan Broadbent
9913996b3c Merge pull request #177 from armen/master 
Fixes 'git fetch' and 'git checkout' liases, closes #176
 2015-05-28 21:49:47 +07:00
Armen Baghumian
5dd21beeea Fixes 'git fetch' and 'git checkout' liases, closes #176 2015-05-28 14:05:33 +00:00
Nathan Broadbent
6183ba963e Merge pull request #175 from armen/master 
Fixed __git_alias bug in zsh
 2015-05-26 21:59:24 +07: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
Nathan Broadbent
737a5d795b Merge pull request #173 from armen/master 
Offset starts from 0 so the argument would be 3
 2015-05-21 14:12:50 +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
Nathan Broadbent
7684788d4b Merge pull request #171 from jsravn/master 
Fix quoting of semicolon and pipe
 2015-05-10 23:43:12 +07:00
James Ravn
bdf6096808 Fix quoting of semicolon and pipe 2015-05-10 00:39:05 +01:00
Nathan Broadbent
4917a4f558 Merge pull request #169 from stephanvane/patch-1 
Fixes #168 (zsh-problems)
 2015-05-08 20:50:11 +07: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
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
Matthew Rothenberg
c6b9c398c8 temp before_script to debug sort order on travis 
I tested manually on OSX and linux, but lets make sure the same thing is
true on travis-ci builds.
 2014-10-20 15:16:04 -04:00
Matthew Rothenberg
9a9b6104e2 Compatibility fix for Design Assets Management 
design.sh uses `readlink -m` to determine canonical path of git dir,
which is not available on all *nix systems (including Darwin).

Instead, use `pwd -P` to get canonical directory path in a more
cross-platform compatible way.

This is a change to an actual script rather than just a test, and it
should make the Design Assets Management functionality of scm_breeze
now function properly on MacOSX.
 2014-10-16 17:20:49 -04:00
Matthew Rothenberg
c234916b2b scripts should exit rather than return 
some shells are pickier about this.  darwin uses a newer version of sh
that complains about it.  this is the ‘proper’ behavior in either
scenario.
 2014-10-16 17:08:29 -04:00
Matthew Rothenberg
ae4b93f52f declare original location of cmds 
The previous tests assumed default locations for all commands, however
they do not exist in the same place on all *nixes.  I encountered this
when the test was failing on MacOSX where it was expected hardcoded
`/bin/sed` when in fact the code was identifying the correct local
expansion of `/usr/bin/sed`.

To make this test more robust, it now checks for the original location
of all cmds and uses that in its expansion tests for
`test_shell_command_wrapping()`.
 2014-10-16 17:05:43 -04:00
Matthew Rothenberg
1cd162434f Make sure we have physical path back from mktemp 
Darwin actually symlinks /var inside /private, but mktemp reports back
the logical pathat time of file creation.  So make sure we always get
the full physical path to be absolutely certain when doing comparisons
later, because thats how the Ruby status_shortcuts.rb script is going to
obtain them.
 2014-10-16 17:05:43 -04:00