Merge branch 'main' into main

Author: alokedesai

specs/android/search_packages_on_android_device.yaml

@@ -0,0 +1,13 @@
+---
+name: Search for a package on a Android device
+command: adb shell pm list packages | grep "{{query}}"
+tags:
+  - android
+  - adb
+description: Use ADB to search for packages on a Android device.
+arguments:
+  - name: query
+    description: A search query for which package you want to find.
+author: Odin Asbjørnsen
+author_url: https://github.com/oas004
+shells: []

specs/git/rebase_master_into_current_branch.yaml

@@ -0,0 +1,16 @@
+---
+name: Rebase master into feature branch
+command: |-
+    git checkout
+    git checkout master
+    git pull origin master
+    git checkout -
+    git pull origin master --rebase
+tags:
+  - git
+description: Rebases master into the feature branch
+arguments: []
+source_url: ""
+author: Varun Jindal
+author_url: "https://www.linkedin.com/in/varun-jindal/"
+shells: []