commit 4135bf504ac5775eb532941a062ce0cb89467ae6 Author: luke Date: Sun Feb 1 13:34:29 2026 -0800 init commit diff --git a/README.txt b/README.txt new file mode 100644 index 0000000..8bf52b8 --- /dev/null +++ b/README.txt @@ -0,0 +1,28 @@ +Welcome to my self hosted git server + +things you should know about git: +- Branches + - Each repo will have a set of branches, main should be the primary branch where everything is tested that it works before hand,any secondary branches are to write code before pushing it to main so that you have a place to store it publicly + +- git clone + - When doing the "git clone git@server:repo" command it is important to note that you will not always start off on the branch that you have write access too, for simplicity check which branch you are on first + +- git commit + - The main method for seeing if your copy of the repo/branch is updated or not. you can make commits locally and the server will also keep track of commits + +- git add + - Locally logs which files you are going to try to commit + +- git push + - Put your commits onto the server + +- git pull + - Grabs files from the server and replaces your files + +- git merge + - attempts to merge the changes from one branch to the current branch, a conflict will arise if the same line is changed + +Notes about this specific git server +- All repos are private by defualt, then read and write permissions are added by the admin (me) +- Inorder to merge main and a branch, someone with both read and write access to both branche, has to pull both branches, and then merge them +- I do not have a static ip adress, so if you encounter an error in which you cannot find the server, my ip may have changed but it is unlikely