399 Commits

Author SHA1 Message Date
Florian Tham
367cf32004 Merge remote-tracking branch 'upstream/master' 2024-07-18 13:59:16 +02:00
Mirko Grönroos
a0f9d8fb69 fix: use grep -E instead of obsolescent egrep
Grep 3.8 and later nag when using egrep
2024-05-08 16:44:00 +03:00
Will Owens
dac7e1ef20 Merge branch 'master' into master 2024-02-27 06:05:52 -05:00
Will Owens
71f97bf3cf [shell_aliases] try fix array looping 2024-02-23 04:13:24 -05:00
Jeff Byrnes
ee57debc69 Merge branch 'master' of github.com:scmbreeze/scm_breeze
* 'master' of github.com:scmbreeze/scm_breeze:
  fix rc file suffix in README
  Return error code from git branch command.
  Use File.exist over deprecated File.exists
  Speed up and simplify parse_git_branch
  Define git functions with parentheses instead of curly braces, so that we can press Ctrl+C to quit the commit prompt without terminating the shell session. (Parentheses run the function in a subshell.)
2023-07-16 16:00:07 -04:00
mike crockett
57e6d583f7 Return error code from git branch command. 2023-01-20 14:01:20 -06:00
Kimmo Brunfeldt
ae2dd1a559 Use File.exist over deprecated File.exists 2023-01-12 08:43:16 +02:00
Nathan Broadbent
0e21e89f3a Speed up and simplify parse_git_branch 2022-11-17 02:27:46 +13:00
telzhov
a4308179ad Fixed completions for 'gl' and 'gla' aliases 2022-11-10 07:48:25 +03:00
Nathan Broadbent
136fb6b4ee Define git functions with parentheses instead of curly braces, so that we can press Ctrl+C to quit the commit prompt without terminating the shell session. (Parentheses run the function in a subshell.) 2022-10-29 15:12:06 +13:00
Jeff Byrnes
c82b7f23b7 Merge remote-tracking branch 'upstream/master'
* upstream/master:
  Switch to output parse of `--version` to determine ls flavor
  Update installation repo URL
2022-07-28 14:09:11 -04:00
Will Owens
38143cd5ec Switch to output parse of --version to determine ls flavor 2022-06-23 15:01:58 -04:00
Jeff Byrnes
27cf045414 Merge remote-tracking branch 'origin/master'
* origin/master:
  Fix shell wrapping for exes with space in path.
  README.md: add remark that some commands don't work w/o ruby
2022-03-25 11:50:52 -04:00
Will Owens
24d08174e7 Merge pull request #299 from jameskeane/wsl-spaces-fix
Fix shell wrapping for exes with space in path.
2022-03-23 18:03:24 -04:00
00ba5ec50b merge upstream/master 2022-02-10 08:59:46 +01:00
Jeff Byrnes
22023c7445 Merge branch 'scmbreeze:master' into main 2021-07-26 14:00:31 -04:00
Yeonghoon Park
27e702bb7a gs fixes 2021-04-14 17:53:54 +09:00
Jeff Byrnes
1a7e93c815 Update Pull Request alias to use gh 2021-01-05 16:22:53 -05:00
telzhov
ad6bfdda3d Replaced calls to '_git' wrapper with its contents, '__git_wrap__git_main'
Since '_git' has been removed in git 2.30
2021-01-02 23:33:39 +03:00
Arthas Park
9187f1b04c Add aliases for git switch (gsw) / git restore (grt) 2020-09-06 01:49:39 +09:00
Jeff Byrnes
800b1b1e0a Avoid running ll code if its not used
Prior to this, if $shell_ls_aliases_enabled="false", this code would
still run, but unnecessarily.
2020-07-29 17:48:53 -04:00
Test User
50ccfd9e97 Fix shell wrapping for exes with space in path.
I experienced this using VS Code in WSL, the `code` CLI is in the
Windows `PATH` that has a space in my user name.

Fixes #294.
2020-02-04 13:23:25 -05:00
Cory Thomas
3c97507b3e Make variables local instead of global 2019-05-15 16:33:10 -05:00
Cory Thomas
cebddb8aba Fix infinite loop when parent directory does not exist
resolves #241
2019-05-15 16:25:14 -05:00
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
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
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