Reindent RST code.
--- a/android.rst Mon Oct 09 10:51:39 2017 +0300
+++ b/android.rst Mon Oct 09 11:39:10 2017 +0300
@@ -9,12 +9,12 @@
Official docs.
==============
- http://developer.android.com/sdk/index.html
- Get the Android SDK
- http://developer.android.com/guide/index.html
- Introduction to Android
- https://android.googlesource.com/platform/system/core/+/master/init/readme.txt
- init.rd file syntax.
+http://developer.android.com/sdk/index.html
+ Get the Android SDK
+http://developer.android.com/guide/index.html
+ Introduction to Android
+https://android.googlesource.com/platform/system/core/+/master/init/readme.txt
+ init.rd file syntax.
Android stats
=============
@@ -31,19 +31,19 @@
Android API levels.
===================
- http://developer.android.com/guide/topics/manifest/uses-sdk-element.html
- "Platform Version / API Level" table.
+http://developer.android.com/guide/topics/manifest/uses-sdk-element.html
+ "Platform Version / API Level" table.
Package repositories.
=====================
- https://play.google.com/
- Google package repository.
- https://f-droid.org/
- Free software repository.
- http://www.appbrain.com/
- AppBrain, alternative catalog to Google Play. Packages is backed via lisnk
- to Google Play.
+https://play.google.com/
+ Google package repository.
+https://f-droid.org/
+ Free software repository.
+http://www.appbrain.com/
+ AppBrain, alternative catalog to Google Play. Packages is backed via lisnk
+ to Google Play.
Link to package description page::
@@ -51,18 +51,18 @@
See also:
- http://android.stackexchange.com/questions/216/what-are-the-alternative-android-app-markets/
- What are the alternative Android app markets?
+http://android.stackexchange.com/questions/216/what-are-the-alternative-android-app-markets/
+ What are the alternative Android app markets?
Mods.
=====
- http://xda-university.com/
- How to mod.
- http://www.cyanogenmod.org/about
- CyanogenMod
- https://www.clockworkmod.com/
- ClockworkMod
+http://xda-university.com/
+ How to mod.
+http://www.cyanogenmod.org/about
+ CyanogenMod
+https://www.clockworkmod.com/
+ ClockworkMod
Connect to Android via USB by adb in Linux
==========================================
@@ -82,8 +82,8 @@
See:
- http://developer.android.com/tools/device.html
- Setting up a Device for Development.
+http://developer.android.com/tools/device.html
+ Setting up a Device for Development.
Connect to Android via USB by adb in Windows
============================================
@@ -171,8 +171,8 @@
See:
- http://teamw.in/project/twrp2
- Custom recovery built.
+http://teamw.in/project/twrp2
+ Custom recovery built.
ADB tips.
=========
@@ -339,7 +339,9 @@
Show screencast from Android.
=============================
- http://droid-at-screen.ribomation.com/
- Easily show the screen of an Android device on a computer/laptop
- (PC, Mac, Linux, ...) and then project the desktop using a
- LCD-projector.
+http://droid-at-screen.org/
+ Easily show the screen of an Android device on a computer/laptop (PC, Mac,
+ Linux, ...) and then project the desktop using a LCD-projector.
+http://droid-at-screen.ribomation.com/
+ Old DNS name.
+
--- a/git.rst Mon Oct 09 10:51:39 2017 +0300
+++ b/git.rst Mon Oct 09 11:39:10 2017 +0300
@@ -146,12 +146,22 @@
List all remote branches (from all remotes)::
$ git ls-remote
+ $ git ls-remote origin
+
+List registered remotes::
+
+ $ git remote show
List remote branches from ``$REMOTE`` remote::
$ git ls-remote --heads $REMOTE
$ git remote show $REMOTE
+Special case of above is ``origin`` remote, which is default remote::
+
+ $ git remote show origin
+ $ git ls-remote --heads origin
+
.. note::
Look to ``[remote "..."]`` in ``~/.git/config`` to find out names of possible
@@ -159,7 +169,8 @@
$ git remote show
-Getting branches pointers from default (``origin``) remote::
+Getting branches pointers from default (``origin``) remote (without merging
+tracking branch)::
$ git fetch
@@ -167,6 +178,20 @@
$ git fetch $REMOTE
+To get updated with default remote changes::
+
+ $ git pull
+
+or specify concrete remote::
+
+ $ git pull $REMOTE
+ $ git pull origin
+
+To locally remove pointers to deleted remotely branches::
+
+ $ git remote update --prune
+ $ git remote update --prune origin
+
.. note::
Only curtain branches fetched by default::