Commit graph

  • 532ff72b8b
    Hackily set gpg.program to work around Tower's weird design main Danielle McLean 2023-11-09 14:46:05 +1100
  • 0730be2026
    Set my preferred tabsize for git-delta Danielle McLean 2023-10-24 15:10:38 +1100
  • c1686f9118
    Migrate from .stow-rename to --dotfiles Danielle McLean 2023-10-23 15:15:06 +1100
  • de371ed2b9
    Add Bun .lockb diff support Danielle McLean 2023-09-18 09:42:01 +1000
  • 42e3323a37
    Add SOPS as a diffing option for encrypted files Danielle McLean 2023-06-27 14:32:20 +1000
  • 6023d60549
    Configure YAML diff with homeport/dyff Danielle McLean 2023-06-15 10:32:00 +1000
  • c968e97fa6
    Fix syntax for git-delta theme setting Danielle McLean 2022-03-31 14:57:47 +1100
  • 7ddfd3571a
    Add support for kovidgoyal/kitty's difftool Danielle McLean 2021-09-15 09:49:54 +1000
  • d264cf1760
    Move includes to end, so they can override Danielle McLean 2021-05-31 15:24:41 +1000
  • 1b9698e41d
    Enable GPG signing at the top of versioned config (config.local can override) Danielle McLean 2021-05-04 10:39:39 +1000
  • 3a7e46a589 Allow config.local to override user.email setting Danielle McLean 2021-04-22 11:34:04 +1000
  • ac61f7f7ce
    Use the lovely init.defaultBranch config option that exists now, rather than the init.templateDir hack Danielle McLean 2020-10-27 08:17:55 +1100
  • cff2dc488d
    Teach Git how to diff GPG-encrypted files, like my password store Danielle McLean 2020-08-20 11:13:06 +1000
  • 3667fbe7d8
    Enable Git's help.autocorrect feature, automatically running the correct command after a two-second confirmation delay if I make a typo Danielle McLean 2020-07-09 13:04:59 +1000
  • 6c8fa3a177
    Update delta configuration to use the new format from delta 0.2.0, and also turn on line numbering? Danielle McLean 2020-07-02 13:09:30 +1000
  • b978b96fb4
    Support SSH pushing to HTTPS remotes on my Gitea instance, as well as on GitHub Danielle McLean 2020-06-18 11:16:59 +1000
  • 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' Danielle McLean 2020-06-14 00:48:13 +1000
  • 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) Danielle McLean 2020-06-14 00:46:15 +1000
  • 46366fb89c
    Switch from diff-so-fancy to delta, which is prettier AND does syntax highlighting too Danielle McLean 2020-06-13 19:33:25 +1000
  • 32b4d27cd4
    Configure pull.rebase = false by default, since that's the expected behaviour and you now get warnings if it's not set Danielle McLean 2020-06-07 16:44:15 +1000
  • f4fcd2e08a
    Switch from --rebase=preserve, which is deprecated, to --rebase=merges Danielle McLean 2020-03-27 14:16:06 +1100
  • 1427a22db4
    Make 'git up' prune branches that have been deleted from the remote Danielle McLean 2020-02-28 12:20:40 +1100
  • 8096375762
    Enable the submodule.recurse configuration flag globally rather than using specialised aliases, I always wanna recurse Danielle McLean 2019-11-18 11:30:16 +1100
  • 2f8309a31f
    Teach git-up alias to recurse submodules, since we're using them now and it seems fitting Danielle McLean 2019-11-13 12:05:11 +1100
  • c9d9e8e4b3
    Make git-finish work with release branches too by having it merge any non-feature branch into master Danielle McLean 2019-03-15 08:31:54 +1100
  • 7bdd6b5659
    Add custom Zsh completion to the git-finish subcommand (yay!) Danielle McLean 2018-08-03 15:48:59 +1000
  • e7005539be
    Enable so-fancy/diff-so-fancy and its recommended colours Danielle McLean 2018-04-19 10:33:00 +1000
  • 8698a048c2
    Make some mild appearance tweaks Danielle McLean 2018-04-19 10:31:09 +1000
  • b083b68e4f
    Remove deprecated git-up configuration and port it across to the current 'up' alias Danielle McLean 2018-03-15 11:38:12 +1100
  • a91decbc47
    git-finish: fast-forward destination branches before merging into them Danielle McLean 2018-03-15 11:37:37 +1100
  • ea343dbfa0
    Add optional pull request support to git-finish (it just adds the request ID to the commit messages) Danielle McLean 2018-03-15 11:37:06 +1100
  • 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 Danielle McLean 2018-01-25 12:16:39 +1100
  • 34ee31361f
    Add a git-up alias because PyGitUp doesn't work in current Git and this alias does /most/ of the work anyway Danielle McLean 2017-11-09 10:06:54 +1100
  • 12017e32c2
    Set push.default to simple, to avoid warnings about the default changing when running slightly older Git versions Danielle McLean 2017-10-06 15:19:22 +1100
  • 5020908bb6
    Enable signed pushes for remotes that support them Danielle McLean 2017-10-06 15:17:48 +1100
  • ad3635c353
    Sort sections of git/config alphabetically - no semantic changes Danielle McLean 2017-10-06 15:16:46 +1100
  • 7b32331bd2
    Add git-finish subcommand, to automate the process of finishing feature and hotfix branches the way I like Danielle McLean 2017-10-06 15:10:55 +1100
  • 1545df64a9
    Slightly smarter git log - decorate by default, and include signature info in the git-l graphlog Danielle McLean 2017-10-06 15:09:43 +1100
  • be3758ff64
    Provide bitbucket.org SSH configuration, since it needs multiplexing to be disabled :/ Danielle McLean 2017-09-03 16:01:20 +1000
  • 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 ;) Danielle McLean 2017-08-17 16:16:32 +1000
  • adf91732a8
    Migrate gpg wrapper from using gpg2 to just gpg, because GnuPG 2.1.23 removes the 'gpg2' alias Danielle McLean 2017-08-10 11:13:58 +1000
  • 7f211abcf8
    Work around a bug in GnuPG by passing it --default-key instead of --local-user when signing a Git commit Danielle McLean 2017-06-14 11:40:56 +1000
  • 9d643fad13
    Change the committer email address to my personal domain Danielle McLean 2017-04-17 18:33:12 +1000
  • 2e374de893
    Improve speed of commit-msg hook by calculating git-guilt only once Danielle McLean 2017-04-14 00:37:20 +1000
  • 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 ) Danielle McLean 2017-04-05 16:34:29 +1000
  • a1e0795e78
    Add gpg2 wrapper program that applies --no-tty flag Danielle McLean 2017-02-27 13:50:28 +1100
  • 8430953d9c
    Enable kdiff3 by default and allow OS-specific packages to override Danielle McLean 2016-11-19 19:07:49 +1100
  • c0f087d8e2
    Make conflicts easier to handle by preserving merges on rebase and enabling rerere Danielle McLean 2016-11-18 09:47:20 +1100
  • 082b24ea47
    Move public user info into the versioned config, and GPG stuff into the private config.local Danielle McLean 2016-10-23 15:03:26 +1100
  • b99c2956eb
    Using stow-rename, unhide all the files :3 Danielle McLean 2016-10-07 23:17:50 +1100
  • 0e6a97b8f3
    Push to GitHub over SSH even if you cloned over HTTPS Danielle McLean 2016-10-04 08:34:07 +1100
  • a8bca133bc
    Migrate everything to GNU Stow locations instead of homeshick Danielle McLean 2016-10-03 22:56:02 +1100
  • d9be263719
    Add co alias for git checkout Danielle McLean 2016-10-03 16:09:54 +1100
  • 9bfd1d1174
    Move configs into XDG_CONFIG_HOME instead Danielle McLean 2016-10-03 15:42:18 +1100
  • 583af04e56
    Initial commit, not a lot to it yet Danielle McLean 2016-10-03 12:44:37 +1100