X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.gitconfig;h=4274c6f7acc52db3c24c4064fea18e632d80b836;hb=1545fda4e3d9b4fd1a06e138ab61513a5633d02e;hp=f64739f6dbe2dfe5e0d64de5075c5478b9e8927c;hpb=5baa81dca5f0aaf98b68d697a631403582243c49;p=dotfiles.git

diff --git a/.gitconfig b/.gitconfig
index f64739f..4274c6f 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,22 +1,142 @@
 [alias]
-	alias = "!f() { [ $# = 2 ] && git config --global alias.\"$1\" \"$2\" && return 0 || echo \"Usage: git alias <new alias> <original command>\" >&2 && return 1; }; f"
-	aliases = !git config --get-regexp 'alias.*' | colrm 1 6 | sed 's/[ ]/ = /'
-	b = branch
+# I copied some aliases from http://gitalias.com/ and other sources.
+# Some I've added to gitalias. Some are mine.
+
+  # One letter alias for our most frequent commands.
+  a = add
+  b = branch
+  c = commit
+  d = diff
+  f = fetch
+  g = grep
+  l = log
+  m = merge
+  o = checkout
+  p = pull
+  r = remote
+  s = status
+  w = whatchanged
+
+  ### add ###
+
+  aa = add --all
+
+  ap = add --patch
+
+  au = add --update
+
+  ### branch ###
+
+  be = branch --edit-description
+
+  bm = branch --merged
+
+  bnm = branch --no-merged
+
+  ### commit ###
+
+  cm = commit --message
+
+  ### checkout ###
+
+  co = checkout
+
+  ### cherry-pick ###
+
+  chp = cherry-pick
+
+  ### diff ###
+
+  # diff - show changes not yet staged
+  dc = diff --cached
+
+  # diff - changes about to be commited
+  ds = diff --staged
+
+  # diff - show changes but by word, not line
+  dw = diff --word-diff
+
+  ### rebase ###
+
+  rb = rebase
+
+  rba = rebase --abort
+
+  rbc = rebase --continue
+
+  rbs = rebase --skip
+
+  # See https://blog.filippo.io/git-fixup-amending-an-older-commit/
+  # This is a slightly modified version
+  fixup = "!f() { TARGET=$(git rev-parse \"$1\"); git commit --fixup=$TARGET && GIT_EDITOR=true exec git rebase --interactive --autosquash $TARGET~; }; f"
+
+  ### remote ###
+
+  rs = remote show
+
+  ru = remote update
+
+  rp = remote prune
+
+  incoming = !git remote update --prune; exec git log ..@{upstream}
+  outgoing = log @{upstream}..
+
+  # Push to all remotes
+  push-to-all-remotes = !git remote | xargs -I% -n1 git push %
+
+  ### show-branch ###
+
+  # show-branch - print a list of branches and their commits.
+  sb = show-branch
+
+  ### status ###
+
+  ss = status --short
+
+  ssb = status --short --branch
+
+  aliases = "!git config --get-regexp '^alias\\.' | colrm 1 6 | sed 's/ / = /'"
+
+  add-alias = "!f() { [ $# = 3 ] && git config $1 alias.\"$2\" \"$3\" && return 0 || echo \"Usage: git add-(local|global)-alias <new alias> <original command>\" >&2 && return 1; }; f"
+  add-global-alias = "!exec git add-alias --global"
+  add-local-alias = "!exec git add-alias --local"
+
+  tags = tag -n1 --list
+
+  # Find text in any commit ever
+  grep-all = !"f() { git rev-list --all | xargs git grep \"$@\"; }; f"
+
+  # Edit all files of the given type
+  edit-cached = !"f() { git ls-files --cached | sort -u ; }; exec `git var GIT_EDITOR` `f`"
+  edit-deleted = !"f() { git ls-files --deleted | sort -u ; }; exec `git var GIT_EDITOR` `f`"
+  edit-others = !"f() { git ls-files --others | sort -u ; }; exec `git var GIT_EDITOR` `f`"
+  edit-ignored = !"f() { git ls-files --ignored | sort -u ; }; exec `git var GIT_EDITOR` `f`"
+  edit-killed = !"f() { git ls-files --killed | sort -u ; }; exec `git var GIT_EDITOR` `f`"
+  edit-modified = !"f() { git ls-files --modified | sort -u ; }; exec `git var GIT_EDITOR` `f`"
+  edit-stage = !"f() { git ls-files --stage | cut -f2 | sort -u ; }; exec `git var GIT_EDITOR` `f`"
+
+  # Editing and adding conflicted files: when we get many merge conflicts
+  # and want to quickly solve them using an editor, then add the  files.
+  edit-unmerged = !"f() { git ls-files --unmerged | cut -f2 | sort -u ; }; exec `git var GIT_EDITOR` `f`"
+  add-unmerged = !"f() { git ls-files --unmerged | cut -f2 | sort -u ; }; exec git add `f`"
+
+  # Get the current branch name
+  branch-name = rev-parse --abbrev-ref HEAD
+
 	branches = branch --all
+	ca = commit --all
+	cv = commit --verbose
+	cav = commit --all --verbose
+	cane = commit --amend --no-edit
+	checkin = commit
+	ci = commit
 	cat = cat-file -p
 	dump = cat-file -p
 	file = cat-file -t
 	type = cat-file -t
-	camend = commit --amend --reuse-message=HEAD
-	checkin = commit
-	ci = commit
-	co = checkout
-	d = diff
-	dc = diff --cached
-	dshow = show --decorate
-	l = log --decorate
 	l1 = log --decorate --oneline
 	l5 = log --decorate -5
+	ld = log --decorate
 	lg = log --decorate --graph
 	lg1 = log --decorate --graph --oneline
 	lg5 = log --decorate --graph -5
@@ -24,16 +144,19 @@
 	lr1 = log --decorate --reverse --oneline
 	lr5 = log --decorate --reverse -5
 	null-merge = merge --strategy=ours
-	remotes = remote -v
-	ri = "!f() { git rebase --interactive --autosquash --preserve-merges ${1:-\"@{u\\}\"}; }; f"
-	#root = !pwd
+	rbi123 = "!f() { exec git rebase --interactive $1 $2 ${3:-\"@{upstream\\}\"}; }; f"
+	rbi = !exec git rbi123 '' ''
+	rbia = !exec git rbi123 --autosquash ''
+	rbiap = !exec git rbi123 --autosquash --preserve-merges
+	rbip = !exec git rbi123 '' --preserve-merges
+	remotes = remote --verbose
+	#root = !exec pwd
 	root = rev-parse --show-toplevel
 	st = status --short
 	stb = status --short --branch
-	tags = tag --list
+	sd = show --decorate
+	sw = show --word-diff --decorate
 	unstage = reset HEAD --
-	wdiff = diff --word-diff
-	wshow = show --word-diff --decorate
 
 [branch]
 	autosetuprebase = always
@@ -55,6 +178,9 @@
 # 3 way diffs
 #	cmd = vim -d \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\" -c \"wincmd J\"
 
+[push]
+	default = simple
+
 [receive]
 	denyNonFastForwards = true