Category: Version control

Git-submodule … allows you to include one repository inside another, keeping them as separate projects. Add a submodule to your

Undo “git rebase -i” $ git rebase -i HEAD~3 $ git reflog … HEAD@{0}: rebase (finish): … … HEAD@{1}: rebase

Command The following command prints the remote branch names, where you are the author of the last pushed commit. $

0. Preparation Checkout the branch you want to rename. 1. Rename local $ git branch -m new-branch-name 2. Change remote

Scenario c1b06e — 62d8d3 [feature] / e73a83 — 6cfaec — 90ed1b [develop] Goal: Merge feature into develop. 2-way merge Solve

Facts It can be locally configured. It can be triggered manually as well. It cleans up not only orphaned commits.

If you don’t want to authorize yourself all the time on the server, just add an ssh key. 1. Generate

Let’s asume you have a repo containing an external SW. (forked repo or specific version) Branches | Commits ————–|————— master

There are common scenarios where you possibly have to resolve conflicts. They are cherry-pick, merge, rebase and revert. If those