rebasing local branch from origin
git pull --rebase
if rebasing from a different remote branch
git pull --rebase origin master
most of the time, after pull, you’ll need to update the submodules
#!/bin/bash | |
command -v gtime >/dev/null 2>&1 || { echo >&2 "GNU time is required. Install it through 'brew install gnu-time'. Aborting."; exit 1; } | |
command -v rs-git-fsmonitor >/dev/null 2>&1 || { echo >&2 "rs-git-fsmonitor is required. Read https://github.com/jgavris/rs-git-fsmonitor#installation for how to install. Aborting."; exit 1; } | |
if [[ "${USER}" != "root" ]]; then | |
echo "Run this script as root, since we need to call dtruss during the script." | |
exit 1 | |
fi |
[buildfile] | |
includes = //DEFS |
#!/bin/sh | |
java -jar git-blame-reviewers-suggestions-1.0-SNAPSHOT-jar-with-dependencies.jar |
package versionbuilder | |
class VersionBuilder { | |
static final int GIT_COMMIT_COUNT_NORMALIZE = 230; | |
static final int GIT_COMMIT_COUNT_MINOR_NORMALIZE = 0; | |
static def buildGitVersionNumber() { | |
return Integer.parseInt('git rev-list --count HEAD'.execute().text.trim()) - GIT_COMMIT_COUNT_NORMALIZE; | |
} |
public class CustomGradleTestRunner extends RobolectricGradleTestRunner { | |
private static final int MAX_SDK_LEVEL = 21; | |
public CustomGradleTestRunner(Class<?> klass) throws InitializationError { | |
super(klass); | |
} | |
@Override | |
public Config getConfig(Method method) { | |
Config config = super.getConfig(method); |
buildscript { | |
repositories { | |
mavenCentral() | |
} | |
dependencies { | |
classpath 'com.android.tools.build:gradle:0.9.+' | |
classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.9.+' | |
} | |
} |
I hereby claim:
To claim this, I am signing this object:
<manifest xmlns:android="http://schemas.android.com/apk/res/android" | |
package="com.menny.android.anysoftkeyboard" | |
android:versionCode="112" | |
android:versionName="20131030"> | |
<uses-sdk | |
android:minSdkVersion="3" | |
android:targetSdkVersion="3" | |
android:maxSdkVersion="3"> | |
</uses-sdk> |
public EdgeEffect(Context context) { | |
final Resources res = context.getResources(); | |
mEdge = res.getDrawable(R.drawable.overscroll_edge); | |
mGlow = res.getDrawable(R.drawable.overscroll_glow); |