Commit Graph

71 Commits

Author SHA1 Message Date
Joe Fleming
6748e2ee7b feat: git config main branch and delta config 2026-03-07 11:25:20 -07:00
Joe Fleming
4dd974484f feat: add git snapshots, update helpers to work with wortrees 2026-02-19 13:20:11 -07:00
Joe Fleming
ffd0ae92d3 Update gitconfig
change b alias so it sorts by update and shows more info, add ll alias as a simple `l` replacement
2023-01-23 10:46:27 -07:00
bc42a3f8ef feat: auto rebase on git bsync command 2020-11-17 11:12:27 -07:00
a9ec765b5d chore: apply shellcheck fixes 2020-11-17 11:12:06 -07:00
4bdd001fb1 fix: unify around the zim git shortcuts, treailing x for delete
BREAKING CHANGE this replaces existing commands
2020-11-17 11:07:59 -07:00
d02733bff1 feat: add git fixup alias and signature support 2020-11-17 11:07:09 -07:00
Joe Fleming
815f54be68 feat: cherry-pick alias, add autosquash 2019-06-20 11:27:51 -07:00
f452ff65ac feat: add docker and misc aliases 2018-05-31 17:21:09 -07:00
56f3fbac81 fix: remove top alias 2018-05-31 17:15:15 -07:00
5dcd2cf0d2 fix: remove brew stuff
mac only :(
2018-05-31 16:29:37 -07:00
c253b61fb0 feat: more git aliases 2018-05-31 16:29:03 -07:00
24517faffc fix: don't copy non-existing aliases 2018-05-31 16:14:37 -07:00
f436cf305e add material theme settings 2016-01-08 11:37:01 -07:00
29e7fe72fb update sublime settings 2016-01-08 11:36:50 -07:00
039227a4c4 remove local bash aliases
rely on custom bash_magic repo
2016-01-07 22:29:10 -07:00
37e501e021 clean up vim packages and logic, make script safer to re-run 2016-01-07 22:15:57 -07:00
aef
82bbb14862 curse you ds_store 2016-01-07 22:15:57 -07:00
aef
63d3460770 preserve the vim/bundle path 2016-01-07 22:15:56 -07:00
fe6f1758cc remove vim bundles 2016-01-07 22:15:56 -07:00
Joe Fleming
21f4828eec Fix github patch url
Also make curl follow redirects in the future
2016-01-07 22:15:48 -07:00
ecca76ea6e no need for fetch, handle failed backports 2015-03-30 13:37:55 -07:00
f9ffcfa0ed tighten up the git pr alias 2015-03-25 16:15:46 -07:00
1da19cd5ab add backporting git alias 2015-03-25 16:15:46 -07:00
Joe Fleming
556aa15bfa add nvm bin path 2015-02-02 14:50:32 -07:00
214f5b8a34 add git helper and alias for updating another branch 2015-01-27 11:11:09 -07:00
e40fed5356 don't remove master, develop or current branch 2015-01-27 11:10:47 -07:00
cc300d2591 save default remote to a var 2015-01-27 11:10:32 -07:00
94b044ce6f fix indenting 2014-12-23 15:42:17 -07:00
f908504059 add custom sublime keymappings 2014-12-23 15:41:28 -07:00
2ae6d06e82 only remove real PR branches 2014-12-23 15:41:02 -07:00
4ba4906c2a add git branch cleanup helper and alias 2014-12-23 15:40:51 -07:00
a10dd6785a some additional git helpers 2014-11-05 11:15:02 -07:00
9143c5cc71 add aliases for git cherry-pick, force pushing and rebase continuing 2014-08-15 11:02:38 -07:00
a7d329344a update git sync; rebase and use passed remote name 2014-08-05 13:52:47 -07:00
e1c70bf425 add alias for git diff --cached 2014-07-22 19:56:25 -07:00
87414c2f59 fix whitespace 2014-07-18 15:35:05 -07:00
da273eabd7 add aliases to sync with other remotes and checkout pull requests 2014-07-18 15:33:54 -07:00
8293e68365 update gitconfig
merge no-ff, new branches auto rebase
2014-05-15 12:25:30 -07:00
a3226a42ad update to current settings 2014-04-30 21:01:47 -07:00
3a8b4263cd add scroll_past_end 2014-04-21 12:19:57 -07:00
18b47a76f0 fix branch info regex 2014-04-21 10:25:03 -07:00
f81ae0f89b added alias for brew cask and git rebase 2014-01-08 16:29:11 -07:00
fd161bc41c added stash notification to git prompt 2013-07-09 20:41:51 -07:00
2cdd93a49b combile sass filetypes, fix stylus filetype 2013-02-21 12:05:39 -07:00
113cb457bc updated ackrc 2013-02-21 11:51:06 -07:00
ef0affaf80 added support for specific dotfiles 2013-02-21 11:46:54 -07:00
754d1691fd add github status alias 2012-12-10 14:55:13 -08:00
Joe Fleming
ccb04603ff added sublime settings 2012-11-06 08:54:21 -07:00
Joe Fleming
f1f7e71107 updated git and svn aliases and set push current in gitconfig 2012-11-05 16:06:10 -07:00