dotfiles/.gitconfig

[alias]
  co = checkout
  sco = restore --staged
  br = branch
  cm = commit
  st = status
  rb = rebase
  pfwl = push --force-with-lease
  llog = log --date=local
  flog = log --pretty=fuller --decorate
  lol = log --graph --decorate --oneline
  lola = log --graph --decorate --oneline --all
  blog = log origin/master... --left-right
  ds = diff --staged
  amend = commit --amend -C HEAD
  fixup = commit --fixup
  squash = commit --squash
  unstage = reset HEAD
  rum = rebase master@{u}
  puff = pull --ff-only
  merff = merge --ff-only
  fa = fetch --all
  pa = push --all

[core]
  editor = nvim

[color]
  ui = auto
  branch = auto
  interactive = auto
  status = auto

[push]
  default = simple

[pull]
  rebase = true
Add fish, tmux, vim, and git dotfiles; clean up 2019-08-15 04:44:46 +00:00			`[alias]`
			`co = checkout`
Add sco alias to .gitconfig 2020-08-09 23:33:45 +00:00			`sco = restore --staged`
Add fish, tmux, vim, and git dotfiles; clean up 2019-08-15 04:44:46 +00:00			`br = branch`
			`cm = commit`
			`st = status`
			`rb = rebase`
Rename push--fwl to pfwl 2020-11-15 05:25:00 +00:00			`pfwl = push --force-with-lease`
Add fish, tmux, vim, and git dotfiles; clean up 2019-08-15 04:44:46 +00:00			`llog = log --date=local`
			`flog = log --pretty=fuller --decorate`
			`lol = log --graph --decorate --oneline`
Updates to fish config, neovim config, vim config, and git config Fish: - Call ssh_agent_startup everytime (has its own conditions) - Add Bun and pnpm bin folders to PATH and aliases - Change additions to path to use fish_add_path - Set LIBVA_DRIVER_NAME to nvidia Neovim: - Format init.lua - Add Vue language server - Change Noice config Vim: - Remove eslint and stylelint as fixers - Add Vue linting/fixing - Use wombat theme for lightline (gruvbox gone?) - Add Lua & Markdown formatting - Update vim-plug Git: - Remove --date-order from 'git lola' alias 2024-06-28 22:41:12 +00:00			`lola = log --graph --decorate --oneline --all`
Add fish, tmux, vim, and git dotfiles; clean up 2019-08-15 04:44:46 +00:00			`blog = log origin/master... --left-right`
			`ds = diff --staged`
Add amend git alias 2021-02-01 00:37:35 +00:00			`amend = commit --amend -C HEAD`
Add fish, tmux, vim, and git dotfiles; clean up 2019-08-15 04:44:46 +00:00			`fixup = commit --fixup`
			`squash = commit --squash`
			`unstage = reset HEAD`
			`rum = rebase master@{u}`
Modify fish, kitty, git, vim, and yabai configs: - fish: changed the way branches are displayed - kitty: specify fonts - git: add puff and merff aliases - vim: - add goyo - add limelight - add yats - add vim-jsx-pretty - modify csharp ale linter - yabai: modify yabai dimensions to mimic bspwm defaults 2019-11-17 19:28:31 +00:00			`puff = pull --ff-only`
			`merff = merge --ff-only`
Change sxhkd browser keymap to firefox and add git command alias 2020-10-31 22:17:46 +00:00			`fa = fetch --all`
Add pa git alias for 'push --all' 2021-05-17 14:16:45 +00:00			`pa = push --all`
Add fish, tmux, vim, and git dotfiles; clean up 2019-08-15 04:44:46 +00:00
			`[core]`
Refactor vimrc settings and plugs: - Reorganize plugs by loading scheme - Remove many config values in lieu of vim-sensible or defaults - Remove some nvim terminal mappings - Swap some normal mappings 2020-02-25 12:48:15 +00:00			`editor = nvim`
Add fish, tmux, vim, and git dotfiles; clean up 2019-08-15 04:44:46 +00:00
			`[color]`
			`ui = auto`
			`branch = auto`
			`interactive = auto`
			`status = auto`

			`[push]`
			`default = simple`

Set default git pull strategy 2020-07-10 18:26:22 +00:00			`[pull]`
			`rebase = true`