Commit Graph

48 Commits

Author SHA1 Message Date
Nathan Broadbent
2541ef9817 Merge pull request #95 from cliffrowley/master
Add git difftool (default alias "gdt")
2013-07-15 20:01:57 -07:00
Nathan Broadbent
0ce8618d90 Added 'git_reset_last_commit' (grsl) alias, useful for undoing a temporary commit 2013-07-04 13:10:12 +12:00
Cliff Rowley
65e62a883b Add git difftool (default alias "gdt") 2013-07-02 16:00:54 +01:00
Abhishek Das
07518479a8 Adds git stash aliases 2013-07-01 18:19:03 +05:30
Nathan Broadbent
d1a9df3844 Added keyboard shortcut to append [ ci skip ] to commit message when committing all files 2013-01-30 11:05:59 +13:00
Nathan Broadbent
63f9fe00d7 Added gbD alias for 'git branch -D', and made gbd do a 'safe' delete with -d 2013-01-30 10:25:13 +13:00
Andy Zhang
8ba76f1cbf Add "gdw" for git diff --word-diff
* Sometimes helpful to see changes inline
* Potential to tweak further with better regex (maybe detect similar char types so diff can be more granular)
2012-12-25 01:36:34 -08:00
Nathan Broadbent
42a5832916 Added 'git tag' alias (gt) 2012-12-10 23:17:54 +13:00
Nathan Broadbent
cd4fb8b079 Added git push -f alias 2012-12-04 13:40:47 +13:00
Nathan Broadbent
281131ef27 Added alias for git rebase -i 2012-10-20 17:31:23 +13:00
Nathan Broadbent
dc2d93453b Remove ls from default wrapped commands 2012-09-11 21:39:47 +12:00
Nathan Broadbent
760ca4eab7 Added gsm alias for git show --summary - handy to view the last commit SHA and message, without the changes 2012-08-22 20:48:36 +12:00
Nathan Broadbent
5e8d512c97 Comment 2012-08-16 03:41:51 +12:00
Nathan Broadbent
f4f3337054 Make $scmb_wrapped_shell_commands configurable 2012-08-16 03:39:03 +12:00
Nathan Broadbent
792b117f7d Added git branch -D alias 2012-08-16 02:58:09 +12:00
Nathan Broadbent
b978b1bd43 Fall back to normal git branch, if any unknown args given. Also add aliases for git branch -a and -m 2012-08-16 02:53:52 +12:00
Nathan Broadbent
9ef8a39409 Use shell_command_wrapping_enabled, since the work was done for Zsh compatibility 2012-08-16 00:36:22 +12:00
Nathan Broadbent
accbcc5957 git_expand_args => scmb_expand_args 2012-08-15 21:10:46 +12:00
Nathan Broadbent
5e7f49ec7d Wrap everything in a git function so that zsh can expand any aliases for tab completion 2012-08-13 04:11:09 +12:00
Nathan Broadbent
bcce949f3c Added git_augment_current_aliases option if you just want to wrap your
current git aliases, instead of overriding them all with new ones.
2012-08-13 02:53:06 +12:00
Nathan Broadbent
79a1132730 Merge pull request #43 from ghthor/master
Simplified git add -p alias
2012-08-12 06:34:45 -07:00
Nathan Broadbent
3a507fbd5a #34 - Increased max changes before falling back to standard git status, from 99 to 150. Also added a explanation message that is shown after the regular git status. 2012-08-13 01:21:23 +12:00
Will Walthall
850be06559 Convert git_add_patch into a simple command 2012-08-12 09:18:02 -04:00
Nathan Broadbent
1d65509bbd Fixed comment. Shortcuts ARE enabled by default. 2012-03-10 17:11:25 +08:00
Nathan Broadbent
5360a767f9 Added alias for 'git checkout -b' 2012-01-28 11:04:26 +08:00
Nathan Broadbent
e22ec216cb Made dashed line lengths equal in example config [ci skip] 2012-01-22 00:52:51 +08:00
Nathan Broadbent
241654930e Added bash command wrapping (expand git numbered args for common bash commands, such as cp, mv, rm, etc.). Also set kb shortcuts to true by default. 2012-01-22 00:40:56 +08:00
Nathan Broadbent
1ab0e75746 Added aliases for git_rebase_alias_continue and git_rebase_alias_abort 2012-01-18 17:32:38 +08:00
Nathan Broadbent
2b6e3a9af0 Revert cf8e3875, added aliases for git reset -- and --hard 2012-01-18 15:34:05 +08:00
Nathan Broadbent
a0f091b0f2 Use ~/code, and 'c' alias. 2012-01-15 12:45:45 +08:00
Nathan Broadbent
0c510f73ff Added alias for git commit -C HEAD (useful at final step of merge conflict) 2012-01-06 16:25:47 +08:00
Nathan Broadbent
e5a1cef5e8 Added 'git clean' and 'git clean -fd' aliases for clearing untracked files. (gce, gcef) 2011-12-23 12:59:50 +08:00
Nathan Broadbent
504bc91fb8 Added git fetch --all alias 2011-12-23 10:58:27 +08:00
Will Walthall
456cedb082 Added an alias for 'git add -p' 2011-10-28 08:00:56 -04:00
Nathan Broadbent
63e5904cee Added 'git_pull_then_push' alias 2011-10-20 08:35:02 +08:00
Nathan Broadbent
d04e2b464e disable keyboard shortcuts by default 2011-10-20 08:32:50 +08:00
Nathan Broadbent
599d491b93 Reverted test alias 2011-10-19 18:21:27 +08:00
Nathan Broadbent
6e9f83584a test 2011-10-19 17:53:17 +08:00
Nathan Broadbent
498a6cf73d another test conflict 2011-10-19 17:52:44 +08:00
Nathan Broadbent
195f9647b3 test conflict 2011-10-19 17:49:43 +08:00
Nathan Broadbent
c45e0f79dc Added hash 2011-10-19 17:48:53 +08:00
Nathan Broadbent
71acfef1db Test patch gen 2011-10-19 17:13:03 +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
2518608b5c Changed more words 2011-10-18 02:28:13 +08:00
Nathan Broadbent
4c93fbdaf8 Updated commands and more labels 2011-10-18 01:41:32 +08:00
Nathan Broadbent
27e72401b6 Copy example conf to rc file if doesnt exist. Tweaked example 2011-10-18 00:44:51 +08:00
Nathan Broadbent
8c95162bc6 Added update function. More name changes 2011-10-18 00:31:12 +08:00
Nathan Broadbent
e634d0c4b5 Initial Commit - moved out of ubuntu_config. 2011-10-18 00:18:17 +08:00