summaryrefslogtreecommitdiff
path: root/.gitconfig
diff options
context:
space:
mode:
authorMike Crute <crutem@amazon.com>2017-09-01 10:23:30 -0700
committerMike Crute <mike@crute.us>2017-09-01 10:23:30 -0700
commit1ec19b2b2cff38dcaf31c5d68435eda045dfcd2b (patch)
tree9c131741026ea0bf645aa0e918f4f92655b6c6ef /.gitconfig
parentb2e1ddd02c1d4b9ac001c44c5afde42ec986a247 (diff)
downloaddotfiles-1ec19b2b2cff38dcaf31c5d68435eda045dfcd2b.tar.bz2
dotfiles-1ec19b2b2cff38dcaf31c5d68435eda045dfcd2b.tar.xz
dotfiles-1ec19b2b2cff38dcaf31c5d68435eda045dfcd2b.zip
Git fm is base command only
Diffstat (limited to '.gitconfig')
-rw-r--r--.gitconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitconfig b/.gitconfig
index 4dcf185..c1d1bcf 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -31,7 +31,7 @@
31 co = checkout 31 co = checkout
32 sm = submodule 32 sm = submodule
33 33
34 fm = merge --ff-only origin/master 34 fm = merge --ff-only
35 in = !git l ..origin/master 35 in = !git l ..origin/master
36 out = !git l origin/master.. 36 out = !git l origin/master..
37 37