-- Leo's gemini proxy
-- Connecting to freeshell.de:1965...
-- Connected
-- Sending request
-- Meta line: 20 text/gemini;lang=en-GB
> Merge branches.
Merge a branch into your current branch:
git merge {branch_name}
Edit the merge message:
git merge -e {branch_name}
Merge a branch and create a merge commit:
git merge --no-ff {branch_name}
Abort a merge in case of conflicts:
git merge --abort
> Copyright © 2014—present the tldr-pages team and contributors.
> This work is licensed under the Creative Commons Attribution 4.0 International License (CC-BY).
-- Response ended
-- Page fetched on Fri May 17 01:34:17 2024