]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
Merge branch 'fix/rename_annotation_opt_to_annotate' of https://github.com/cgoesche... master
authorKarel Zak <kzak@redhat.com>
Mon, 6 Oct 2025 12:31:29 +0000 (14:31 +0200)
committerKarel Zak <kzak@redhat.com>
Mon, 6 Oct 2025 12:31:29 +0000 (14:31 +0200)
* 'fix/rename_annotation_opt_to_annotate' of https://github.com/cgoesche/util-linux-fork:
  man-common: rename annotation.adoc to annotate.adoc
  swapon: use ANNOTATE_OPTION as enum name for --annotate
  swapon: rename the new --annotation option to --annotate
  swapon: (usage) make the help text fit within 80 columns again


Trivial merge