| commit | 7f9d95630c52a394e63dcff629db07164fa9a794 | [log] [tgz] |
|---|---|---|
| author | Jake Whatley <jacob.whatley91@gmail.com> | Fri Jul 15 06:12:40 2016 +0200 |
| committer | Gerrit Code Review <gerrit2@gerrit> | Fri Jul 15 06:12:40 2016 +0200 |
| tree | c4473049b8bcefbb401563a9c3d8acf4610f0c03 | |
| parent | 3bb10928188fb988c2aaf1e17ab433e89b17ad2d [diff] | |
| parent | 3def7e0b23f70b1238be84793a203c67204596cc [diff] |
Merge "aosp-merge.sh: use fetch --tags" into android-6.0
diff --git a/utils/aosp-merge.sh b/utils/aosp-merge.sh index e08946b..dfd197d 100755 --- a/utils/aosp-merge.sh +++ b/utils/aosp-merge.sh
@@ -45,7 +45,7 @@ git remote add aosp https://android.googlesource.com/platform/$path > /dev/null fi - git fetch aosp + git fetch --tags aosp #echo "=====================================================================" #echo " Merging {$ref}"