From 275ab1f1754c299300ca8a88ffc6bcfca29f6000 Mon Sep 17 00:00:00 2001 From: Malin Freeborn Date: Wed, 26 Feb 2020 10:31:17 +0100 Subject: [PATCH] clarify git.md --- data/git.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/data/git.md b/data/git.md index 4b73c10..c44a5ef 100644 --- a/data/git.md +++ b/data/git.md @@ -36,7 +36,7 @@ Check your history: 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": @@ -75,6 +75,10 @@ Once you like the feature, merge it into the main branch. Switch to master then > git merge featurez +and delete featurez as you've already merged it: + +> git branch -d featurez + # 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. @@ -123,7 +127,6 @@ Gitlab requires more changes, such as going to `settings > repository` and switc > git repack - ## Find Binary Blobs ```