diff options
author | Elliott Hughes <enh@google.com> | 2014-06-09 22:53:08 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-06-09 22:53:08 +0000 |
commit | d317951a6b15f0ca6e2a697d4796895b876985d1 (patch) | |
tree | 86ec400454228b2c0ff72cfb066ff98f14c14a07 | |
parent | 64b8857e409fac2b55520bb50120a30b821d766d (diff) | |
parent | 60b6d90b1f9d018f450462e57906b538071eec3c (diff) | |
download | strace-d317951a6b15f0ca6e2a697d4796895b876985d1.tar.gz |
Merge "Improve the documentation for syncing upstream strace."
-rw-r--r-- | Android.mk | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -20,11 +20,13 @@ LOCAL_PATH := $(call my-dir) # To update: # +# git remote add strace git://git.code.sf.net/p/strace/code # git fetch strace # git merge strace/master # mm -j32 # # (Make any necessary Android.mk changes and test the new strace.) -# git push +# git push aosp HEAD:master # Push directly, avoiding gerrit. +# git push aosp HEAD:refs/for/master # Push to gerrit. # # # Now commit any necessary Android.mk changes like normal: # repo start post-sync . |