diff options
| author | Michael Vogt <mvo@debian.org> | 2014-01-25 22:40:04 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-01-25 22:40:04 +0100 |
| commit | 6fa5b7b71e5c8ec5d4bec7bec3ef311c4d9c826b (patch) | |
| tree | a02ec2b10f30e713eedd3f7c63cc44051fb6c859 /cmdline/apt-mark.cc | |
| parent | 72af508bdbca55d0752aab3369faa1dc944a04e7 (diff) | |
| parent | 9aef3908c892f9d9349d8bf8a5ceaeea313ba0fe (diff) | |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
configure.ac
Diffstat (limited to 'cmdline/apt-mark.cc')
| -rw-r--r-- | cmdline/apt-mark.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/cmdline/apt-mark.cc b/cmdline/apt-mark.cc index ebb1f9892..d3a3a780b 100644 --- a/cmdline/apt-mark.cc +++ b/cmdline/apt-mark.cc @@ -386,6 +386,11 @@ bool ShowHelp(CommandLine &CmdL) "Commands:\n" " auto - Mark the given packages as automatically installed\n" " manual - Mark the given packages as manually installed\n" + " hold - Mark a package as held back\n" + " unhold - Unset a package set as held back\n" + " showauto - Print the list of automatically installed packages\n" + " showmanual - Print the list of manually installed packages\n" + " showhold - Print the list of package on hold\n" "\n" "Options:\n" " -h This help text.\n" |