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

593 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wilhelmina Drengwitz
6baa3c90c8 Merge pull request #128 from dlee/fix_branch_shortcuts_offset 
Fix shortcuts offset when branch_shortcuts encounters detached HEAD
 2017-02-07 09:08:55 -05:00
Wilhelmina Drengwitz
b1a6ae6196 Merge pull request #229 from vise890/fix-tests 
make tests independent of bin locations
 2017-02-06 17:05:19 -05:00
Wilhelmina Drengwitz
6f4babeced Extend tests to use conditional exe paths 2017-01-31 15:50:14 -05:00
Wilhelmina Drengwitz
86e1a5094c Merge pull request #230 from chrisfinazzo/shellcheck 
Fix Shellcheck error
 2017-01-31 15:43:56 -05:00
Wilhelmina Drengwitz
e95b9a33a1 Fix printf usage 2017-01-31 15:42:21 -05:00
chrisfinazzo
31f561a991 Fix Shellcheck error 2017-01-30 20:51:25 -05:00
Wilhelmina Drengwitz
8c21b3d87f Merge pull request #152 from mroth/fix-clear-vars 
BUGFIX: make `git_clear_vars()` actually clear variables
 2017-01-30 15:21:44 -05:00
Wilhelmina Drengwitz
beacd7d8a6 Merge pull request #153 from mroth/integrated-branch-porcelain 
integrate branch parsing into single system call
 2017-01-30 15:19:59 -05:00
Wilhelmina Drengwitz
71777ba667 Merge pull request #227 from vise890/remove-hg-svn-bzr 
remove unimplemented scms
 2017-01-30 14:32:26 -05:00
Wilhelmina Drengwitz
38d1e2a6b9 Merge pull request #225 from vise890/readme-refresh 
reorganize readme
 2017-01-30 14:31:03 -05:00
Martino Visintin
455239f594 make tests independent of bin locations 
On my system (Arch Linux), the commands {mv,rm,sed} live under
`/usr/bin`, not under `/bin`. So the tests were failing.

This commit hard-codes the initial paths to make the tests independent
on their real paths.
 2017-01-27 21:41:53 +00:00
Martino Visintin
4d4736d406 remove unimplemented scms 2017-01-27 21:22:43 +00:00
Martino Visintin
6d0637ba67 prune subsections from TOC 2017-01-27 21:05:00 +00:00
Martino Visintin
1c072b3354 reorganize readme 
- lines are now ~= 80 chars
- update links to point to scmbreeze/scm_breeze
- update travis banner link
- promote install instructions to top-ish of readme
- consolidate contributing section
- remove some horizontal lines
 2017-01-27 21:02:45 +00:00
Wilhelmina Drengwitz
fc05821db6 Merge pull request #218 from vise890/patch-1 
change install path to org repo
 2017-01-26 16:20:28 -05:00
Martino Visintin
1a5d3f52e0 change install path to org repo 2017-01-21 16:36:33 +00:00
Wilhelmina Drengwitz
9e19c76700 Merge pull request #216 from ZhangBanger/master 
Bump git index depth to 5 for golang src structure
 2016-11-14 19:22:55 -05:00
Andy Zhang
76fc67b9fd Bump git index depth to 5 for golang src structure 2016-11-14 11:30:06 -08:00
Tobias Baumhöver
b5606ed897 changed alias for git_log_stat_alias from gls to glst due to issue with recent zsh update 2016-11-01 13:33:50 +01:00
Wilhelmina Drengwitz
ac6a7808b7 Merge branch 'fix-bash-invalid-return-usage' 2016-08-28 15:30:18 -04:00
Wilhelmina Drengwitz
121803b857 Fix invalid use of return in bash test runner 2016-08-28 15:29:29 -04: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
0dd155b57a Another update 2016-08-17 15:01:32 +07:00
Nathan Broadbent
49dca42056 Remove "gh" alias 2016-08-17 15:00:51 +07:00
Nathan Broadbent
db08d30928 Updated README 2016-08-17 15:00:50 +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
65cab55514 Merge pull request #187 from brianpeiris/patch-1 
Add note about ruby in installation section.
 2016-05-14 22:39:58 +07:00
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