Commit Graph

139 Commits

Author SHA1 Message Date
Nathan Broadbent
d128fb58d7 Fixed merge conflict resolution functions to handle multiple expanded arguments 2012-08-13 00:58:51 +12:00
Nathan Broadbent
aaf4f5fac5 Use tabs as delimiter so that files with spaces are properly handled. Escape spaces only in exec_git_expand_args, use tabs to split everything else. 2012-08-13 00:22:16 +12:00
Nathan Broadbent
c4f49c96d7 Use escaped git function, so it doesn't go through any aliases like hub 2012-08-12 21:32:05 +12:00
Nukul Bhasin
240399bd92 work around for ndbroadbent/scm_breeze#27 2012-08-12 21:19:49 +12:00
Nathan Broadbent
9930ba5331 Added switch for zsh / bash 2012-08-12 21:16:05 +12:00
Nathan Broadbent
55950ad896 Merge pull request #40 from flipkick/master
bugfix for #33. don't add a trailing space when creating aliases
2012-08-12 02:00:49 -07:00
Nathan Broadbent
0ccb241833 removed tabs 2012-07-14 10:47:45 +12:00
Nathan Broadbent
6d6e1455be Reindented new lines 2012-07-14 10:47:07 +12:00
Alhad Purnapatre
5071256716 Avoid infinite loop in __gs_relative_path when $(PWD) contains a symlink. 2012-07-13 14:24:35 -07:00
flipkick
d9734ef039 fixes #33, don't define the aliases with a trailing space when there is no following argument 2012-06-22 22:42:30 +02:00
Nathan Broadbent
4531d9566a Made the default 'git log' command nicer (thanks to http://coderwall.com/p/euwpig?i=3&p=1&t=git :) 2012-06-20 15:50:59 +12:00
coodix
97721437c9 Change _find_git_repos function fixing situation when no one repo was found by "c --rebuild" when $GIT_REPO_DIR is symbolic link 2012-05-20 22:41:08 +04:00
Minsu Choi
a8319e187d avoid "bash:unbound" error when "nounset" option enabled (set -o nounset) 2012-05-09 09:15:01 +09:00
Nathan Broadbent
b50639f55c Fixed list_aliases() function for Zsh. (Use alias instead of alias -p, and tweaked sed to support both output formats.) 2012-05-08 16:35:56 +12:00
Nathan Broadbent
5e14302f56 Use 'autoload -Uz bashcompinit', as recommended in #21 2012-05-08 16:25:00 +12:00
Nathan Broadbent
4fb9123f19 Merge pull request #24 from tylerholien/master
Changed usage text to reflect '-' ranges instead of '..' ranges
2012-05-07 21:06:10 -07:00
Nathan Broadbent
b1aba1480b Replace 'command grep' with '\grep' to break out of aliases 2012-05-08 16:02:20 +12:00
Giuseppe
f9f6da479e Forgot other command grep 2012-05-02 23:03:26 +02:00
Giuseppe Rota
ff1a59ddb7 forgot another one command grep 2012-05-02 21:45:03 +02:00
Giuseppe Rota
cc48bcb82f Substitute all grep instances with command grep 2012-04-26 17:27:50 +02:00
Giuseppe Rota
843a662149 avoid possible aliasing of grep 2012-04-26 00:11:42 +03:00
Tyler Holien
596b370b78 Changed usage text to reflect '-' ranges instead of '..' ranges 2012-04-25 15:01:52 -05:00
Nathan Broadbent
fa9a255ac4 Fixed branch iteration for array in _git_index_update_all_branches function 2012-03-20 14:53:29 +08:00
Nathan Broadbent
323405477a If $NOTIFY is set, use notify-send to send git repo update notifications 2012-03-18 23:52:07 +08:00
Nathan Broadbent
5944f8c7fa Removed update_travis_ci_status function (moved to ndbroadbent/dotfiles repo) 2012-03-18 22:33:46 +08:00
Nathan Broadbent
06a2065f01 Fixed line editing detection for bind 2012-03-18 00:46:17 +08:00
Nathan Broadbent
ae5b8b5357 Fixed conditions for keybindings 2012-03-12 13:04:20 +08:00
Nathan Broadbent
ab7865867d Fixed test for shell and vi mode 2012-03-10 17:11:32 +08:00
Nathan Broadbent
56a5e21e4e Don't set emacs style keybindings for bash when in vi mode 2012-03-10 16:02:14 +08:00
Nathan Broadbent
b59caec489 Attempted fix for keyboard bindings (#19) 2012-03-10 12:51:18 +08:00
Nathan Broadbent
7d6bbb3afd Travis-ci requires 'hub' gem to be installed. Ensure that it is available. 2012-03-10 09:59:06 +08:00
Nathan Broadbent
aca96a5e8c Fix defaut IFS for Ubuntu 11.x 2012-03-08 17:35:03 +08:00
Nathan Broadbent
c5fc3f283f Wrap token in quotes for zsh 2012-02-29 00:20:57 +08:00
Nathan Broadbent
885d528c35 Fixed local variables for ZSH 2012-02-28 22:39:58 +08:00
Jonathan del Strother
077f22da0b Don't export 'i' and 'cmd_output' as global vars 2012-02-28 12:42:38 +00:00
Nathan Broadbent
c68f0c523a Added function to delete a git branch from local, cached remote and remote server 2012-02-22 11:28:48 +08:00
Nathan Broadbent
5d46601889 Ignore both the stat file and the temp stat file 2012-02-16 16:04:12 +08:00
Nathan Broadbent
0f34d130bc { cp -f ... rm -f } === { mv -f }. lol. 2012-02-03 17:55:05 +08:00
Nathan Broadbent
f95e9a8544 Updating build statuses for all branches only periodically is still too slow. Now it only updates statuses for branches from remotes/origin that also have a local copy 2012-02-03 17:51:40 +08:00
Nathan Broadbent
f403169176 Escape git command (in case it's aliased) 2012-02-03 15:03:20 +08:00
Nathan Broadbent
f71372a8e9 Expanded travis ci build status update, so that it can perform frequent updates for the current branch, and periodic updates for all branches. Updating all branches was taking over 20 minutes. 2012-02-03 11:35:08 +08:00
Nathan Broadbent
78cc2d46ea Make sure bin/git is used to parse branch (turn off hub wrapper if present) 2012-02-01 12:12:10 +08:00
Nathan Broadbent
4cf8671a1c Use mislav's 'travis-ci' gist to show build status for current branch 2012-01-31 17:26:03 +08:00
Nathan Broadbent
7fd415bbf4 Fixed bug in refactor 2012-01-31 01:15:22 +08:00
Nathan Broadbent
cf31c9a15e 'eval' serves no purpose here either 2012-01-31 01:14:56 +08:00
Nathan Broadbent
7049e7fb64 Fixed git_add_patch_shortcuts 2012-01-31 01:13:00 +08:00
Nathan Broadbent
006ac0da7c Disable bash command wrapping until issues are fixed with escaped characters (i.e. whitespace in filenames) 2012-01-31 00:53:11 +08:00
Nathan Broadbent
2a2987cc87 Renamed and fixed travis update script, as well as git_ignore function 2012-01-31 00:52:15 +08:00
Nathan Broadbent
89b98eb986 Use $HOME in cron script, base_path no longer applicable 2012-01-31 00:28:13 +08:00
Nathan Broadbent
ada316bd5b Use builtin cd for batch commands 2012-01-31 00:11:10 +08:00