commit 3c540aec245f6c010ef2d5e82a22b871335dd1c6
author Elliott Hughes <enh@google.com> Tue Nov 10 19:25:14 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 10 19:25:14 2015 +0000
tree 4ff828563ed761bda76286a86d7989be9e212c27
parent d75b6b925748d3a241866a2662f2ec0e4db9101c
parent 0e42c2a4ad06be7601377da0b3abc2cc2ad86cbf

Merge "Add -e to the adb shell documentation."

adb/commandline.cpp

diff --git a/adb/commandline.cpp b/adb/commandline.cpp
index dfa5ef2..6e4c4e8 100644
--- a/adb/commandline.cpp
+++ b/adb/commandline.cpp
@@ -112,11 +112,12 @@
         "                                 (-a preserves file timestamp and mode)\n"
         "  adb sync [ <directory> ]     - copy host->device only if changed\n"
         "                                 (-l means list but don't copy)\n"
-        "  adb shell [-Ttx]             - run remote shell interactively\n"
-        "  adb shell [-Ttx] <command>   - run remote shell command\n"
-        "                                 (-T disables PTY allocation)\n"
-        "                                 (-t forces PTY allocation)\n"
-        "                                 (-x disables remote exit codes and stdout/stderr separation)\n"
+        "  adb shell [-e escape] [-Tt] [-x] [command]\n"
+        "                               - run remote shell command (interactive shell if no command given)\n"
+        "                                 (-e: choose escape character, or \"none\"; default '~')\n"
+        "                                 (-T: disable PTY allocation)\n"
+        "                                 (-t: force PTY allocation)\n"
+        "                                 (-x: disable remote exit codes and stdout/stderr separation)\n"
         "  adb emu <command>            - run emulator console command\n"
         "  adb logcat [ <filter-spec> ] - View device log\n"
         "  adb forward --list           - list all forward socket connections.\n"