From f73ae1720d5ca7ad2bf3784a3294b29d4c6c3ee5 Mon Sep 17 00:00:00 2001 From: Hsieh Chin Fan Date: Tue, 9 Mar 2021 17:33:27 +0800 Subject: update --- alias | 1 + gitconfig | 3 +++ 2 files changed, 4 insertions(+) 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 -- cgit v1.2.3-70-g09d2