Commit graph

27 commits

Author SHA1 Message Date
b083b68e4f
Remove deprecated git-up configuration and port it across to the current 'up' alias 2018-03-15 11:38:12 +11:00
a91decbc47
git-finish: fast-forward destination branches before merging into them 2018-03-15 11:37:37 +11:00
ea343dbfa0
Add optional pull request support to git-finish (it just adds the request ID to the commit messages) 2018-03-15 11:37:06 +11:00
a1949c40a2
Set up the git-lfs filter in config/git/config - won't mess anything up if git-lfs isn't installed since it only applies if the local repo references it 2018-01-25 12:16:39 +11:00
34ee31361f
Add a git-up alias because PyGitUp doesn't work in current Git and this alias does /most/ of the work anyway 2017-11-09 10:06:54 +11:00
12017e32c2
Set push.default to simple, to avoid warnings about the default changing when running slightly older Git versions 2017-10-06 15:19:22 +11:00
5020908bb6
Enable signed pushes for remotes that support them 2017-10-06 15:17:48 +11:00
ad3635c353
Sort sections of git/config alphabetically - no semantic changes 2017-10-06 15:16:46 +11:00
7b32331bd2
Add git-finish subcommand, to automate the process of finishing feature and hotfix branches the way I like 2017-10-06 15:10:55 +11:00
1545df64a9
Slightly smarter git log - decorate by default, and include signature info in the git-l graphlog 2017-10-06 15:09:43 +11:00
be3758ff64
Provide bitbucket.org SSH configuration, since it needs multiplexing to be disabled :/ 2017-09-03 16:01:20 +10:00
a3a1105103
Set icon for git-dude notifications - it doesn't always exist at all, but it should always be at that path if it exists ;) 2017-08-17 16:16:32 +10:00
adf91732a8
Migrate gpg wrapper from using gpg2 to just gpg, because GnuPG 2.1.23 removes the 'gpg2' alias 2017-08-10 11:13:58 +10:00
7f211abcf8
Work around a bug in GnuPG by passing it --default-key instead of --local-user when signing a Git commit 2017-06-14 11:40:56 +10:00
9d643fad13
Change the committer email address to my personal domain 2017-04-17 18:33:12 +10:00
2e374de893
Improve speed of commit-msg hook by calculating git-guilt only once 2017-04-14 00:37:20 +10:00
e0038e9420
Replace the post-commit hook with a commit-msg hook that does the same thing (but that avoids needing to amend every commit :3 ) 2017-04-05 16:34:29 +10:00
a1e0795e78
Add gpg2 wrapper program that applies --no-tty flag 2017-02-27 13:50:28 +11:00
8430953d9c
Enable kdiff3 by default and allow OS-specific packages to override 2016-11-19 19:07:49 +11:00
c0f087d8e2
Make conflicts easier to handle by preserving merges on rebase and enabling rerere 2016-11-18 09:47:20 +11:00
082b24ea47
Move public user info into the versioned config, and GPG stuff into the private config.local 2016-10-23 15:03:26 +11:00
b99c2956eb
Using stow-rename, unhide all the files :3 2016-10-07 23:17:50 +11:00
0e6a97b8f3
Push to GitHub over SSH even if you cloned over HTTPS 2016-10-04 08:34:07 +11:00
a8bca133bc
Migrate everything to GNU Stow locations instead of homeshick 2016-10-03 22:56:02 +11:00
d9be263719
Add co alias for git checkout 2016-10-03 16:09:54 +11:00
9bfd1d1174
Move configs into XDG_CONFIG_HOME instead 2016-10-03 15:42:27 +11:00
583af04e56
Initial commit, not a lot to it yet 2016-10-03 12:44:37 +11:00