|
|
a17927f231
|
Add Catppuccin themes to Delta
|
2024-05-31 12:28:59 +10:00 |
|
Danielle McLean
|
532ff72b8b
|
Hackily set gpg.program to work around Tower's weird design
|
2023-11-09 14:46:05 +11:00 |
|
Danielle McLean
|
0730be2026
|
Set my preferred tabsize for git-delta
|
2023-10-24 15:10:38 +11:00 |
|
Danielle McLean
|
c1686f9118
|
Migrate from .stow-rename to --dotfiles
|
2023-10-23 15:15:06 +11:00 |
|
|
|
de371ed2b9
|
Add Bun .lockb diff support
|
2023-09-18 09:42:01 +10:00 |
|
Danielle McLean
|
42e3323a37
|
Add SOPS as a diffing option for encrypted files
|
2023-06-27 14:32:20 +10:00 |
|
Danielle McLean
|
6023d60549
|
Configure YAML diff with homeport/dyff
|
2023-06-15 10:32:00 +10:00 |
|
Danielle McLean
|
c968e97fa6
|
Fix syntax for git-delta theme setting
|
2022-03-31 14:57:47 +11:00 |
|
|
|
7ddfd3571a
|
Add support for kovidgoyal/kitty's difftool
|
2021-09-15 09:49:54 +10:00 |
|
Danielle McLean
|
d264cf1760
|
Move includes to end, so they can override
|
2021-05-31 15:24:41 +10:00 |
|
Danielle McLean
|
1b9698e41d
|
Enable GPG signing at the top of versioned config (config.local can override)
|
2021-05-04 10:39:39 +10:00 |
|
|
|
3a7e46a589
|
Allow config.local to override user.email setting
|
2021-04-22 11:34:04 +10:00 |
|
|
|
ac61f7f7ce
|
Use the lovely init.defaultBranch config option that exists now, rather than the init.templateDir hack
|
2020-10-27 08:17:55 +11:00 |
|
|
|
cff2dc488d
|
Teach Git how to diff GPG-encrypted files, like my password store
|
2020-08-20 11:13:06 +10:00 |
|
|
|
3667fbe7d8
|
Enable Git's help.autocorrect feature, automatically running the correct command after a two-second confirmation delay if I make a typo
|
2020-07-09 13:04:59 +10:00 |
|
|
|
6c8fa3a177
|
Update delta configuration to use the new format from delta 0.2.0, and also turn on line numbering?
|
2020-07-02 13:09:47 +10:00 |
|
|
|
b978b96fb4
|
Support SSH pushing to HTTPS remotes on my Gitea instance, as well as on GitHub
|
2020-06-18 11:16:59 +10:00 |
|
|
|
c63a078b6e
|
Provide a HEAD ref in my git-init template, so that the default branch for all new repositories will be called the very reasonable term 'main'
|
2020-06-14 00:48:13 +10:00 |
|
|
|
2f73cb554e
|
Create a git-init template directory, which is just copied from the sample one that comes with Git (2.27.0, if it matters)
|
2020-06-14 00:46:15 +10:00 |
|
|
|
46366fb89c
|
Switch from diff-so-fancy to delta, which is prettier AND does syntax highlighting too
|
2020-06-13 19:33:25 +10:00 |
|
|
|
32b4d27cd4
|
Configure pull.rebase = false by default, since that's the expected behaviour and you now get warnings if it's not set
|
2020-06-07 16:44:15 +10:00 |
|
|
|
f4fcd2e08a
|
Switch from --rebase=preserve, which is deprecated, to --rebase=merges
|
2020-03-27 14:16:06 +11:00 |
|
|
|
1427a22db4
|
Make 'git up' prune branches that have been deleted from the remote
|
2020-02-28 12:20:40 +11:00 |
|
|
|
8096375762
|
Enable the submodule.recurse configuration flag globally rather than using specialised aliases, I always wanna recurse
|
2019-11-18 11:30:16 +11:00 |
|
|
|
2f8309a31f
|
Teach git-up alias to recurse submodules, since we're using them now and it seems fitting
|
2019-11-13 12:05:11 +11:00 |
|
|
|
c9d9e8e4b3
|
Make git-finish work with release branches too by having it merge any non-feature branch into master
|
2019-03-15 08:31:54 +11:00 |
|
|
|
7bdd6b5659
|
Add custom Zsh completion to the git-finish subcommand (yay!)
|
2018-08-03 15:48:59 +10:00 |
|
|
|
e7005539be
|
Enable so-fancy/diff-so-fancy and its recommended colours
|
2018-04-19 10:33:00 +10:00 |
|
|
|
8698a048c2
|
Make some mild appearance tweaks
|
2018-04-19 10:31:09 +10:00 |
|
|
|
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 |
|
