summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Tate <ctate@google.com>2011-10-04 16:16:14 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-10-04 16:16:14 -0700
commit114f2421fef49d5312763c3c0d6804e096df77e9 (patch)
treeb0ed47544754d6c378d097b7a12b8c168b5d0a29
parent134959a621ab03232f08d8ce6198e6a578311022 (diff)
parent56885094b63af1b0077dec16bc695aa09d8043fc (diff)
downloadsystem_core-114f2421fef49d5312763c3c0d6804e096df77e9.zip
system_core-114f2421fef49d5312763c3c0d6804e096df77e9.tar.gz
system_core-114f2421fef49d5312763c3c0d6804e096df77e9.tar.bz2
Merge "Add command line help for the new 'adb backup -all -nosystem'"
-rw-r--r--adb/commandline.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/adb/commandline.c b/adb/commandline.c
index 973932f..4c15232 100644
--- a/adb/commandline.c
+++ b/adb/commandline.c
@@ -129,18 +129,22 @@ void help()
" adb bugreport - return all information from the device\n"
" that should be included in a bug report.\n"
"\n"
- " adb backup [-f <file>] [-apk|-noapk] [-shared|-noshared] [-all] [<packages...>]\n"
- " - Write an archive of the device's data to <file>.\n"
- " If a -f option is not supplied then the data is\n"
- " written to \"backup.ab\" in the current directory.\n"
+ " adb backup [-f <file>] [-apk|-noapk] [-shared|-noshared] [-all] [-system|-nosystem] [<packages...>]\n"
+ " - write an archive of the device's data to <file>.\n"
+ " If no -f option is supplied then the data is written\n"
+ " to \"backup.ab\" in the current directory.\n"
" (-apk|-noapk enable/disable backup of the .apks themselves\n"
" in the archive; the default is noapk.)\n"
" (-shared|-noshared enable/disable backup of the device's\n"
" shared storage / SD card contents; the default is noshared.)\n"
" (-all means to back up all installed applications)\n"
+ " (-system|-nosystem toggles whether -all automatically includes\n"
+ " system applications; the default is to include system apps)\n"
" (<packages...> is the list of applications to be backed up. If\n"
" the -all or -shared flags are passed, then the package\n"
- " list is optional.)\n"
+ " list is optional. Applications explicitly given on the\n"
+ " command line will be included even if -nosystem would\n"
+ " ordinarily cause them to be omitted.)\n"
"\n"
" adb restore <file> - restore device contents from the <file> backup archive\n"
"\n"