Commit Graph

409 Commits

Author SHA1 Message Date
Nathan Broadbent
dec2fff0bf Support coreutils on Mac, which provides a greadlink command that supports the -f option (brew install coreutils) 2018-12-19 20:05:05 +07:00
Nathan Broadbent
5bc863284b Change maxdepth to 3 in _find_git_repos (c --rebuild was taking too long) 2018-12-18 21:28:02 +07:00
Tom "Ravi" Hale
d15ece1d99 _scmb_git_branch_shortcuts: quote $@ inside ruby heredoc 2018-10-09 12:12:08 +07:00
Wilhelmina Drengwitz
a8cf40722d Merge branch 'master' into quote-filenames 2018-09-28 13:12:38 -04:00
Nathan Broadbent
e5971cfdd5 Added keyboard shortcut to add all changes to the previous commit (Ctrl+x, z) 2018-09-26 23:15:12 +07:00
Nathan Broadbent
8233abd23f Save/restore the git commit message in case a git pre-commit hook fails. Also rename the APPEND var to GIT_COMMIT_MSG_SUFFIX. 2018-09-26 23:08:00 +07:00
Nathan Broadbent
5530e693b3 Added ~/.staff_sym emoji, and some docs to the README 2018-09-24 18:06:52 +07:00
Tom "Ravi" Hale
48302bcd8c Be compatible with shells of Ubuntu 14.04 2018-09-18 17:03:01 +07:00
Tom "Ravi" Hale
e5da83665a bin_path(): use builtin commands and avoid which 2018-09-14 19:58:25 +07:00
Tom "Ravi" Hale
f85b9a4727 git_show_affected_files: make $f local 2018-09-14 19:58:25 +07:00
Tom "Ravi" Hale
4adf771492 Ensure file ordering matches in both invocations of ls 2018-09-14 19:58:25 +07:00
Tom "Ravi" Hale
e46a7c3309 ls_with_file_shortcuts: fail rather than create incorrect variables
Removes the danger from issue #274.

The proper fix will need to address issue #260.
2018-09-14 19:58:09 +07:00
Tom "Ravi" Hale
80ec1ad2ad Replace built-in shell array quoting with printf %q 2018-09-12 17:57:46 +07:00
Jeff Byrnes
8761a4758b Add alias & default shortcut for git mergetool
Provides parity with the `gdt` alias for `git difftool`
2018-09-11 10:36:34 -04:00
Willa Drengwitz
1a9411dd4a Revert to legacy status shortcuts ruby script 2018-09-05 12:24:14 -04:00
Tom "Ravi" Hale
a580c53004 ls_with_file_shortcuts: print error to STDERR 2018-09-02 11:34:33 +07:00
Tom "Ravi" Hale
a6eeebfa91 shell_shortcuts.sh: remove unnecessary subshell 2018-09-02 11:34:32 +07:00
Tom "Ravi" Hale
86d9d4b189 shell_shortcuts.sh: fix quoting 2018-09-02 11:34:32 +07:00
Tom "Ravi" Hale
a8092bffd9 Clean up ls_with_file_shortcuts() shwordsplit tests 2018-09-02 11:34:32 +07:00
Tom "Ravi" Hale
0b5a29bbd6 Invoke readlink -f in a way which can succeed 2018-09-02 11:34:32 +07:00
Tom "Ravi" Hale
73ed8cb53e scmb_expand_args: return an array to fix quoting issues 2018-09-02 11:28:47 +07:00
Tom "Ravi" Hale
fb7d227c30 Add _safe_eval: quote $@ elements before eval 2018-09-02 11:28:19 +07:00
Tom "Ravi" Hale
d5c60b2cc5 git_status_shortcuts: don't clobber $IFS 2018-09-01 20:19:57 +07:00
Tom "Ravi" Hale
3a5b7a685a _print_path: remove unnecessary pipeline 2018-09-01 20:14:36 +07:00
Tom "Ravi" Hale
5f286eaaaa Quote arrays to avoid splitting by $IFS 2018-09-01 20:14:36 +07:00
Wilhelmina Drengwitz
8a326c2505 Merge pull request #262 from ghthor/refactor_of_git_status
Refactor of git status, Closes #132
2018-08-31 16:11:14 -04:00
Willa Drengwitz
750697e925 Add quotes around files with spaces 2018-08-31 16:02:39 -04:00
Willa Drengwitz
f0ef9b06f6 Add back too status max files check 2018-08-31 13:51:34 -04:00
Willa Drengwitz
e789faa1fd Merge remote-tracking branch 'origin/master' into refactor_of_git_status 2018-08-31 13:24:24 -04:00
Nathan Broadbent
e8a5f775d1 Use "^M" on Zsh and "\n" on Bash 2018-09-01 00:22:33 +07:00
Willa Drengwitz
0acc0223a5 Add legacy status script 2018-08-31 13:22:16 -04:00
Nathan Broadbent
e6b1785910 Revert "Use ^M instead of" - Stick with "\n" for now so that Ctrl + x + space works on bash
This reverts commit 1f3b8a6b11.
2018-08-31 23:53:42 +07:00
David Lee
7189656854 [PATCH] Add grep_shortcuts
Closes #125, Thanks David Lee!
2018-08-31 09:33:37 -04:00
Willa Drengwitz
d0c8329137 Fix sorting order 2018-08-31 08:58:23 -04:00
Willa Drengwitz
e6363ac955 Merge remote-tracking branch 'mroth/osx-testing' into osx-testing 2018-08-31 07:48:09 -04:00
Tom "Ravi" Hale
70b4e62bb0 Remove -- from end of aliases 2018-08-18 14:35:43 +07:00
Tom "Ravi" Hale
77b1717008 Avoid test with no arguments and unnecessary subshell 2018-08-17 12:49:07 +07:00
Michael Mior
1f3b8a6b11 Use ^M instead of
for newlines
2018-07-05 16:21:02 -04:00
Nathan Broadbent
65df76ebe4 Fixed key binding 2017-05-06 23:13:45 +07:00
Nathan Broadbent
6745822953 Fix IFS issues - have to always unset after use 2017-02-19 20:05:59 +07: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
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
Martino Visintin
4d4736d406 remove unimplemented scms 2017-01-27 21:22:43 +00:00
Andy Zhang
76fc67b9fd Bump git index depth to 5 for golang src structure 2016-11-14 11:30:06 -08: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
49dca42056 Remove "gh" alias 2016-08-17 15:00:51 +07:00
Emmanuel B
c655ace09c added 'git apply' alias 2016-07-06 07:53:18 -04:00