Commit Graph

564 Commits

Author SHA1 Message Date
Wilhelmina Drengwitz
6143b31a11 Merge pull request #258 from ghthor/osx-testing
OSX/Darwin testing and compatibility - Retest
2018-08-31 09:03:34 -04:00
Willa Drengwitz
f5850830fa Fix tr illegal command 2018-08-31 09:01:06 -04:00
Willa Drengwitz
89cf0eb6ad Run shfmt 2018-08-31 08:58:41 -04:00
Willa Drengwitz
d0c8329137 Fix sorting order 2018-08-31 08:58:23 -04:00
Willa Drengwitz
a3ff809cbe Fix ordering to match declare order 2018-08-31 07:56:58 -04:00
Willa Drengwitz
e6363ac955 Merge remote-tracking branch 'mroth/osx-testing' into osx-testing 2018-08-31 07:48:09 -04:00
Wilhelmina Drengwitz
87f848b07f Merge pull request #257 from ghthor/fix-for-uninstall
Fix uninstall for osx
2018-08-31 07:34:51 -04:00
Willa Drengwitz
744cae46d6 Fix uninstall for osx 2018-08-31 07:29:44 -04:00
Wilhelmina Drengwitz
92689b3a19 Add links to alternatives 2018-08-31 07:13:23 -04:00
Wilhelmina Drengwitz
975e423b80 Merge pull request #253 from HaleTom/no_trailing_--_in_aliases
Remove "--" from end of aliases
2018-08-24 10:54:38 -04:00
Tom "Ravi" Hale
70b4e62bb0 Remove -- from end of aliases 2018-08-18 14:35:43 +07:00
Wilhelmina Drengwitz
8966fc9585 Merge pull request #251 from HaleTom/fix-sed-test-pipefail
Fix #250 - Avoid test with no arguments and unnecessary subshell
2018-08-17 02:04:02 -04:00
Tom "Ravi" Hale
77b1717008 Avoid test with no arguments and unnecessary subshell 2018-08-17 12:49:07 +07:00
Wilhelmina Drengwitz
4c95bafbd3 Merge pull request #246 from michaelmior/fix-newline
Use ^M instead of  for newlines
2018-07-05 16:59:55 -04:00
Michael Mior
1f3b8a6b11 Use ^M instead of
for newlines
2018-07-05 16:21:02 -04:00
Wilhelmina Drengwitz
7f635b0e42 Merge pull request #249 from nqb/patch-1
replace 'ge' by `ge`
2018-06-27 13:08:27 -04:00
Nicolas Quiniou-Briand
ca5c15d4a0 replace 'ge' by ge 2018-06-27 08:44:57 -04:00
Nathan Broadbent
a59ace0f29 Changed logo 2017-09-26 02:47:48 +07:00
Nathan Broadbent
e0606ae9e8 Merge pull request #236 from bpolge/master
plugin-ified scm_breeze
2017-09-25 17:55:07 +07:00
Nathan Broadbent
2ef2fdc77a Remove maintainer message, made a little logo 2017-09-25 17:53:40 +07:00
Nathan Broadbent
65df76ebe4 Fixed key binding 2017-05-06 23:13:45 +07:00
Benjamin Polge
cd6f7d8640 plugin-ified scm_breeze 2017-03-09 11:58:35 -05:00
Nathan Broadbent
6745822953 Fix IFS issues - have to always unset after use 2017-02-19 20:05:59 +07:00
Martino Visintin
39f6596861 fix bin path testing 2017-02-12 20:43:00 +00:00
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
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