clarify git.md

This commit is contained in:
Malin Freeborn 2020-02-26 10:31:17 +01:00
parent 3e9b36493c
commit 275ab1f175

View File

@ -36,7 +36,7 @@ Check your history:
Get the url of your git remote and add it, with the name "origin": Get the url of your git remote and add it, with the name "origin":
> git remove add origin git@gitlab.com:FirstBloodRPG/first-blood.git > git remote add origin git@gitlab.com:bindrpg/core
Tell git you're pushing the branch "master" to the remote repo "origin": Tell git you're pushing the branch "master" to the remote repo "origin":
@ -75,6 +75,10 @@ Once you like the feature, merge it into the main branch. Switch to master then
> git merge featurez > git merge featurez
and delete featurez as you've already merged it:
> git branch -d featurez
# Subtree # Subtree
The project has subdirectories sub-1,sub-2,sub-3. The first should be its own repository, but should also retain its own history. The project has subdirectories sub-1,sub-2,sub-3. The first should be its own repository, but should also retain its own history.
@ -123,7 +127,6 @@ Gitlab requires more changes, such as going to `settings > repository` and switc
> git repack > git repack
## Find Binary Blobs ## Find Binary Blobs
``` ```