aboutsummaryrefslogtreecommitdiff
path: root/files/.gitconfig
diff options
context:
space:
mode:
Diffstat (limited to 'files/.gitconfig')
-rw-r--r--files/.gitconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/files/.gitconfig b/files/.gitconfig
index 100be4f..5b3b5cb 100644
--- a/files/.gitconfig
+++ b/files/.gitconfig
@@ -21,4 +21,3 @@
ka = !sh -c 'gitk --all' -
kb = !sh -c 'gitk --branches' -
fix = commit --amend -C HEAD
- integrate = !sh -c 'git rebase master $1 && git checkout master && git merge --ff $1' -