Commit Graph

303 Commits

Author SHA1 Message Date
Nathan Broadbent
4c42f5df56 Merge remote branch 'beef/master'
Conflicts:
	install.sh
	lib/scm_breeze.sh
2011-10-21 08:38:54 +08:00
Nathan B
29f5e4c598 Merge pull request #8 from lmeijvogel/master
Make grs work with deleted files
2011-10-20 17:30:26 -07:00
Andrew Lorente
cb8a3a6121 Remove dependency on seq
seq is unfortunately not available on OSX. Brackets appear to be fully
shell- and platform-independent.
2011-10-20 13:47:19 -07:00
Andrew Lorente
99e4e9dcda Fix a typo in a function name 2011-10-20 13:47:10 -07:00
Lennaert Meijvogel
cf8e3875a3 Add '--' to git reset command to make it work for deleted files. 2011-10-20 21:55:51 +02:00
Andrew Lorente
bf5d50fcb8 Remove restrictions on directory for scm-breeze
Previously the script had to be installed to ~/.scm_breeze. Now it can
live anywhere!
2011-10-20 11:27:31 -07:00
Trey Hunner
f9244d0f94 Remove bashisms from scm breeze update scripts 2011-10-20 10:51:03 -07:00
Nathan Broadbent
33fe02982a Fixed bug when trying to use gc -m "commit message" 2011-10-20 20:27:26 +08:00
Nathan Broadbent
4d5126731a Added missing parse_git_branch function 2011-10-20 19:30:55 +08:00
Jonathan del Strother
7deb0c7909 Add zsh/shwordsplit compatibility for git_status_shortcuts
Necessary so that IFS works as expected
2011-10-20 12:11:08 +01:00
Nathan Broadbent
a4d5006b5a Removed sed command. I can't remember why it was necessary. 2011-10-20 12:47:32 +08:00
Nathan Broadbent
6c82cc25ed Made git_show_affected_files cross platform at the expense of colorized revision (for now) 2011-10-20 12:11:59 +08:00
Nathan Broadbent
8700f41ba8 Fixed the previous fix.. 2011-10-20 12:05:53 +08:00
Nathan Broadbent
3f37f8f53d Made status command use grep instead of head & tail 2011-10-20 12:02:54 +08:00
Nathan Broadbent
63e5904cee Added 'git_pull_then_push' alias 2011-10-20 08:35:02 +08:00
Nathan Broadbent
ebc791afe8 Merge branch 'master' of github.com:ndbroadbent/scm_breeze 2011-10-20 08:33:32 +08:00
Nathan Broadbent
d04e2b464e disable keyboard shortcuts by default 2011-10-20 08:32:50 +08:00
Nathan B
824e6ab984 Merge pull request #1 from daverigby/master
Fix _create_or_patch_scmbrc to work on OS X (10.7)
2011-10-19 17:17:33 -07:00
Nathan Broadbent
a66a6d4d3f Made tail and head commands portable 2011-10-20 08:07:19 +08:00
Dave Rigby
5b6e349b48 Fix _create_or_patch_scmbrc to work on OS X (10.7)
On OS X's version of mktemp the -t parameter is manditory -
see http://developer.apple.com/library/mac/#DOCUMENTATION/Darwin/Reference/ManPages/man1/mktemp.1.html
2011-10-19 20:30:22 +01:00
Nathan Broadbent
d2ebf6bdeb Clear vars first 2011-10-20 01:27:06 +08:00
Nathan Broadbent
090a4d920d tweaked comment 2011-10-19 21:28:45 +08:00
Nathan Broadbent
70b32895d6 removed comments 2011-10-19 21:25:11 +08:00
Nathan Broadbent
11d453d8fb Ignore bindings if not defined 2011-10-19 21:24:21 +08:00
Nathan Broadbent
a6bc784cc5 removed dup file 2011-10-19 20:12:29 +08:00
Nathan Broadbent
5e8dd2a93a Fixed message 2011-10-19 20:11:48 +08:00
Nathan Broadbent
21c2f1b4ff Tell user to load SCM Breeze manually. 2011-10-19 18:33:32 +08:00
Nathan Broadbent
2d54f0d9de fully ignore warnings 2011-10-19 18:24:13 +08:00
Nathan Broadbent
f43ca59244 Ignore bind complaints if not sourcing install script 2011-10-19 18:23:33 +08:00
Nathan Broadbent
36c883e0d6 removed test 2011-10-19 18:20:39 +08:00
Nathan Broadbent
5d361590bb Fixed typo 2011-10-19 18:20:25 +08:00
Nathan Broadbent
ef2bd8a78d Added svn test 2011-10-19 18:19:58 +08:00
Nathan Broadbent
63491cd97f Updated install task, use shared function to create example scmbrc files 2011-10-19 18:19:29 +08:00
Nathan Broadbent
c77060a757 Removed test function 2011-10-19 18:13:48 +08:00
Nathan Broadbent
16f14291bf added test function 2011-10-19 18:13:24 +08:00
Nathan Broadbent
25d4d250cb reload SCM breeze after updating 2011-10-19 18:12:33 +08:00
Nathan Broadbent
c51b2934e0 Revert "Test that new scm can be added and rolled out"
This reverts commit 0dc8257ba2.
2011-10-19 18:10:47 +08:00
Nathan Broadbent
0dc8257ba2 Test that new scm can be added and rolled out 2011-10-19 18:09:46 +08:00
Nathan Broadbent
7328c32b9a Made update script load and run latest update code 2011-10-19 18:09:13 +08:00
Nathan Broadbent
72dec92d35 Reorganised code 2011-10-19 18:04:54 +08:00
Nathan Broadbent
c5c5d5d547 fixed space 2011-10-19 17:54:06 +08:00
Nathan Broadbent
204907b34c colored message 2011-10-19 17:52:29 +08:00
Nathan Broadbent
f086bf00c9 Made a fancy update script for SCM Breeze. Patches are generated for example scmbrc files, and an attempt is made to apply these patches to the user's ~/.*.scmbrc config files. Also fixed _alias() function. 2011-10-19 17:45:34 +08:00
Nathan Broadbent
48a8cf6f7d comments 2011-10-19 16:53:08 +08:00
Nathan Broadbent
8be41f63d0 Added alias wrapper to ignore errors when alias isn't defined. 2011-10-19 16:52:19 +08:00
Nathan Broadbent
5f2a4a3ee7 Added git alias 2011-10-18 02:33:26 +08:00
Nathan Broadbent
4c93fbdaf8 Updated commands and more labels 2011-10-18 01:41:32 +08:00
Nathan Broadbent
425a8ab264 Renamed 'git_repo' to more appropriate 'git_index' 2011-10-18 01:29:01 +08:00
Nathan Broadbent
acd8e42ee9 Better shared variable name. 2011-10-18 00:36:36 +08:00
Nathan Broadbent
8c95162bc6 Added update function. More name changes 2011-10-18 00:31:12 +08:00