Commit graph

182 commits

Author SHA1 Message Date
Scott Wallace 10d8d833bd Make 'git history' alias backward compatible. 2015-09-29 20:21:08 +01:00
Scott Wallace 56e206ab74 Ensure a noop if we have an ssh-agent environment configured. 2015-09-29 19:49:49 +01:00
Scott Wallace 8fd9f6a8e3 Ensure ssh-agent is running and a default key is added. 2015-09-29 19:41:04 +01:00
Scott Wallace 69c05d0b37 Revert "Add the launch of tmux, if available."
This reverts commit 77e9a05e9c.
2015-09-23 23:05:34 +01:00
Scott Wallace 2313fe22d1 Ensure tmux windows start numbering from 1. 2015-09-23 22:48:31 +01:00
Scott Wallace f1238300d5 Add a tmux config file. 2015-09-23 22:40:50 +01:00
Scott Wallace 77e9a05e9c Add the launch of tmux, if available. 2015-09-23 22:10:35 +01:00
Scott Wallace c894899c2a Disable auto-quit of iTerm2 on last window close. 2015-09-23 20:12:54 +01:00
Scott Wallace 7b0d835022 Update iTerm2 to allow window resizing. 2015-09-23 20:02:09 +01:00
Scott Wallace 0bbdc495f3 Remove window number from iTerm2 window title. 2015-09-23 18:39:39 +01:00
Scott Wallace 63df85f5bf Added iTerm2 config. 2015-09-23 14:50:40 +01:00
Scott Wallace bcb9372262 Change flush-dns script to be a bit neater. 2015-09-15 19:58:46 +01:00
Scott Wallace 52ffbcf0e7 Revert the no-ff Git change. 2015-09-15 19:39:44 +01:00
Scott Wallace 22afd81596 Change to a better Mac-friendly DNS flush method. 2015-09-15 19:38:24 +01:00
Scott Wallace 9193348356 Add a Git alias for a detailed log output. 2015-09-14 18:33:10 +01:00
Scott Wallace a029458150 Remove the abstraction of a function for determining the current Git branch in the prompt. 2015-09-14 13:26:36 -04:00
Scott Wallace 813b8d65f6 Disable fast-forward merging. 2015-09-09 13:32:20 +01:00
Scott Wallace 23fbe67379 Merge branch 'master' of github.com:scottwallacesh/dotfiles 2015-09-09 13:29:18 +01:00
Scott Wallace 4249556b1d Updated the flush DNS command for Yosemite. discoveryutil is no longer available. 2015-09-03 18:49:54 +01:00
Scott Wallace db869fed03 Added a check for coreutils and PATH modification if found. 2015-07-14 09:37:02 +01:00
Scott Wallace a59c4608fd Cosmetic. 2015-06-20 11:42:12 +01:00
Scott Wallace dac7239ed1 Revert setting Vim's yank buffer to the system clipboard. Deletes are adding the clipboard. 2015-06-20 11:41:26 +01:00
Scott Wallace dd7cb146ae Set Vim's yank buffer to the system clipboard 2015-06-20 11:37:22 +01:00
Scott Wallace 26e83ce792 Simplfied the generate password script. 2015-06-15 20:35:11 +01:00
Scott Wallace 54fae1f0d1 Added a shebang line to the DNS flush script. 2015-06-15 20:29:14 +01:00
Scott Wallace db114e4bea Changed history tracking. Removed 'mixed' history to 'separate' but still saved. 2015-05-20 20:43:57 +01:00
Scott Wallace 5368fe091a Remove NerdTree from opening by default. 2015-05-20 15:11:09 +01:00
Scott Wallace e23480b3dd Small change to the genpw script usage output. 2015-05-18 19:52:02 +01:00
Scott Wallace c316235ca5 Updated the flush DNS script for OS X v10.13. 2015-05-18 19:51:16 +01:00
Scott Wallace 6de0dcbde9 Updated the Flush DNS script slightly. 2015-05-09 15:51:21 +01:00
Scott Wallace 6ccfce0dc5 Added NerdTree Tab support. 2015-04-22 15:22:54 +01:00
Scott Wallace 3389f8a122 Default to rebase on pull. 2015-03-26 20:49:28 +00:00
Scott Wallace d37f95bc4c Updated the .gitconfig with some more aliases and settings. 2015-03-26 18:45:15 +00:00
Scott Wallace 6b516b3e8a Refactered the password generator script. 2015-03-26 18:25:58 +00:00
Scott Wallace 403897b2e0 Add the local user's bin/ directory to the front of PATH. 2015-03-26 18:12:00 +00:00
Scott Wallace 97eb5aad38 Removed some older, redundant scripts. 2015-03-26 18:11:05 +00:00
Scott Wallace 2d18b7027b Added a script to flush the DNS on any OS. Needs work. 2015-03-26 18:10:32 +00:00
Scott Wallace ce951fcd98 Fixed .gitconfig. 2015-03-26 17:59:16 +00:00
Scott Wallace 157d649cf9 Rename Git alias 'prune' due to conflict with built-in. 2015-03-24 09:13:26 +00:00
Scott Wallace 0ea447fa17 Merge branch 'master' of https://github.com/scottwallacesh/dotfiles 2015-03-23 10:02:34 +00:00
Scott Wallace fd2d05e4de Moved two Git aliases from .bashrc to .gitconfig. 2015-03-23 09:49:21 +00:00
Scott Wallace 407092c1d2 Added a nicer way to view Git logs. 2015-03-23 09:43:45 +00:00
Scott Wallace 14719bcf80 Ensure vi uses vim. 2015-03-06 17:41:24 +00:00
Scott Wallace 79bcd7bc52 Added colour to the Git branch prompt indicator. 2015-02-20 14:27:47 +00:00
Scott Wallace cbacbe862f Change the bracket-type for the Git branch display. 2015-02-13 09:40:54 +00:00
Scott Wallace c51ac21a13 Print the current Git branch as part of the CLI prompt. 2015-02-09 14:18:12 +00:00
Scott Wallace b7fbc9583e Update the 'll' alias to behave more like the real thing. 2015-02-04 10:54:13 +00:00
Scott Wallace cdc4cc0e9d Add 'll' alias for OS X. 2015-01-29 10:04:38 +00:00
Scott Wallace fbd308270b Updated the method for bash completion scripts.
Added bash completion for Git.
2015-01-27 14:41:16 +00:00
Scott Wallace c68aaaca16 Added an alias for pruning dead Git branches. 2015-01-22 08:04:02 +00:00