Commit graph

7 commits

Author SHA1 Message Date
Scott Wallace 813b8d65f6 Disable fast-forward merging. 2015-09-09 13:32:20 +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 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 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