Skip to content

GitLab

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
apk-tools
apk-tools
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 59
    • Issues 59
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 14
    • Merge Requests 14
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
  • Operations
    • Operations
    • Environments
  • Analytics
    • Analytics
    • CI / CD
    • Repository
    • Value Stream
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • alpine
  • apk-toolsapk-tools
  • Merge Requests
  • !23

Closed
Opened Apr 22, 2020 by Ariadne Conill@kaniiniContributor
  • Report abuse
Report abuse

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch "https://gitlab.alpinelinux.org/kaniini/apk-tools.git" "master"
git checkout -b "kaniini/apk-tools-master" FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout "master"
git merge --no-ff "kaniini/apk-tools-master"

Step 4. Push the result of the merge to GitLab

git push origin "master"

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

Revert "Update apk to make man pages sole source of truth"

  • Overview 8
  • Commits 1
  • Changes 20

This reverts commit b62d252b.

This change is reverted because it basically makes the tool completely obtuse and unusable for people who do not have the manpages installed. The reason why apk is a beloved package manager is because it is simple to use, but if you remove all guidance on how to use it, then nobody will know how to use it.

Man pages are good, but removing built-in help is not:

petrie:~/apk-tools$ LD_LIBRARY_PATH=src src/apk --help
apk-tools 2.10.4-91-g47053ed, compiled for x86_64.

usage: apk <COMMAND> [-h|--help] [-p|--root DIR] [-X|--repository REPO] [-q|--quiet] [-v|--verbose] [-i|--interactive] [-V|--version] [-f|--force] [--force-binary-stdout] [--force-broken-world] [--force-non-repository] [--force-old-apk] [--force-overwrite]
           [--force-refresh] [-U|--update-cache] [--progress] [--progress-fd FD] [--no-progress] [--purge] [--allow-untrusted] [--wait TIME] [--keys-dir KEYSDIR] [--repositories-file REPOFILE] [--no-network] [--no-cache] [--cache-dir CACHEDIR] [--cache-max-age AGE]
           [--arch ARCH] [--print-arch] [<args>...]

This apk has coffee making abilities.
Edited Apr 22, 2020 by Ariadne Conill
Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View project labels
Reference: alpine/apk-tools!23
Source branch: master