eryn/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[git] Add some aliases for rebase and merge process; clean up tabs in the config

Browse source
This commit is contained in:
Eryn Wells 2016-09-16 14:07:49 -07:00
parent fe4fd1d8be
commit b4a82263b6
1 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

21
gitconfig
View file

@ -7,8 +7,6 @@
excludesfile = ~/.gitignore excludesfile = ~/.gitignore
[color] [color]
ui = auto ui = auto
[merge]
tool = Kaleidoscope
[alias] [alias]
# Commits # Commits
c = commit c = commit
@ -35,9 +33,13 @@
# Merges and rebases # Merges and rebases
m = merge m = merge
ma = merge --abort
mt = mergetool mt = mergetool
rb = rebase rb = rebase
rbi = rebase --interactive rbi = rebase --interactive
rbc = rebase --continue
rba = rebase --abort
rbs = rebase --skip
# Resets, moving HEAD # Resets, moving HEAD
r = reset r = reset
@ -49,20 +51,23 @@
# Remotes # Remotes
p = push -u p = push -u
pf = push -uf
f = fetch f = fetch
sup = submodule update --recursive sup = submodule update --recursive
[ui] [ui]
color = true color = true
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[diff] [diff]
tool = Kaleidoscope tool = KS
[difftool]
prompt = false
[difftool "KS"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[merge]
tool = KS
[mergetool] [mergetool]
keepBackup = true keepBackup = true
prompt = false prompt = false
[difftool] [mergetool "KS"]
prompt = false
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustExitCode = true trustExitCode = true
[push] [push]