remove flags, clean up

main
Ben Kristinsson 4 months ago
parent 698d9c52e9
commit 3bc005af1b

@ -1,50 +0,0 @@
[user]
email = benedikt.kristinsson@care.com
name = Ben Kristinsson
[diff]
submodule = log
[pull]
rebase = false
[push]
default = current
[init]
defaultBranch = main
[alias]
n = checkout -b
b = branch
p = pull
st = status
graph = log --graph --all --pretty=format:"%h%x09%d%x20%s"
bradd = !sh -c 'git checkout master && git pull && git checkout -b "$1" master && git push -u origin "$1"' -
brdel = !sh -c 'git checkout master && git pull && git branch --delete "$1" && git push origin --delete "$1"' -
brpub = !sh -c 'git checkout master && git pull && git checkout "$1" && git rebase master && git push --force origin HEAD' -
brlint = !sh -c 'al -t $(git diff --name-only origin | egrep -i ya?ml$)'
# will take all uncomitted and un-staged changes currently in workding dir and add to previous commit
caa = commit -a --amend -C HEAD
fixup = !sh -c 'git commit --fixup HEAD && EDITOR=cat git rebase --autosquash -i HEAD~2 | grep -v "^#"' -
fu = fixup
[core]
pager = less -F -X
hooksPath = "/home/benedikt.kristinsson/.git/hooks"
[credential "https://github.com"]
useHttpPath = true
helper = /usr/local/bin/credential-github-app
[github-app-helper]
key = ~/.caredevopsro.2021-12-01.private-key
app-id = 155699
[blame]
coloring = highlightRecent

@ -21,8 +21,6 @@ parser.add_argument(
help="print scp commands, do not run them")
args = parser.parse_args()
## TODO: Make a --care option to push to the relevant hosts
emacs_config = {
"emacs/.emacs": "~/.emacs",
"emacs/.emacs.d/": "~/.emacs.d/",

Loading…
Cancel
Save