update

2 files changed, 4 insertions, 0 deletions

diff --git a/alias b/alias
index df3e05e..6cf3eb5 100644
--- a/alias
+++ b/alias
@@ -211,6 +211,7 @@ alias geothings-test='ssh geothings@test.geothings.tw'
 
 # Android
 alias debug='./gradlew app:installDebug && adb shell am start -n com.geothings.geobingan/.MainActivity_'
+alias adb.view='adb shell am start -a android.intent.action.VIEW -d' 
 alias adb_default='adb shell dumpsys package domain-preferred-apps'
 alias adb_list='adb shell dumpsys package d'
 alias rmcache='rm -rf ~/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/*'
diff --git a/gitconfig b/gitconfig
index d74ea7d..bdc0121 100644
--- a/gitconfig
+++ b/gitconfig
@@ -18,5 +18,8 @@
 [merge]
     tool = vimdiff
 
+[pull]
+    ff = only
+
 [credential]
     helper = store