8
0
Fork
You've already forked shell-server
0

Sorted out the unsorted like suggested #134

Open
lokiwho wants to merge 2 commits from lokiwho/patch-1 into master
pull from: lokiwho/patch-1
merge into: hashbang-sh:master
hashbang-sh:master
hashbang-sh:basic-https-support
hashbang-sh:fix-tab-syntax
hashbang-sh:fix-man-installation-path
hashbang-sh:remove-with-items
hashbang-sh:lxd
hashbang-sh:ansible/roles
hashbang-sh:pam-cleanup
hashbang-sh:packer
hashbang-sh:packer-ryan
lokiwho commented 2021年04月17日 05:47:10 +02:00 (Migrated from github.com)
Copy link

This is my first attempt at really editing things with github! I sorted as suggested

This is my first attempt at really editing things with github! I sorted as suggested
This pull request can be merged automatically.
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin lokiwho/patch-1:lokiwho/patch-1
git switch lokiwho/patch-1

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch master
git merge --no-ff lokiwho/patch-1
git switch lokiwho/patch-1
git rebase master
git switch master
git merge --ff-only lokiwho/patch-1
git switch lokiwho/patch-1
git rebase master
git switch master
git merge --no-ff lokiwho/patch-1
git switch master
git merge --squash lokiwho/patch-1
git switch master
git merge --ff-only lokiwho/patch-1
git switch master
git merge lokiwho/patch-1
git push origin master
Sign in to join this conversation.
No reviewers
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
hashbang-sh/shell-server!134
Reference in a new issue
hashbang-sh/shell-server
No description provided.
Delete branch "lokiwho/patch-1"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?