Difference between revisions of "Moodle, ownCloud, GitLab, MediaWiki, vsCode, NetBeans"
Jump to navigation
Jump to search
(→GIT) |
(→GIT) |
||
Line 3: | Line 3: | ||
ssh-keygen -t ed25519 -C "RHO_ERP_WEB_KEY" | ssh-keygen -t ed25519 -C "RHO_ERP_WEB_KEY" | ||
nano /c/Users/user/.ssh/id_ed25519.pub | nano /c/Users/user/.ssh/id_ed25519.pub | ||
− | |||
* Git global setup | * Git global setup | ||
git config --global user.name "Allen 123" | git config --global user.name "Allen 123" | ||
− | git config --global user.email " | + | git config --global user.email "[[/cdn-cgi/l/email-protection|[email protected]]]" |
− | |||
* Create a new repository | * Create a new repository | ||
git credential-manager clear | git credential-manager clear | ||
Line 16: | Line 14: | ||
git commit -m "add README" | git commit -m "add README" | ||
git push -u origin master | git push -u origin master | ||
− | |||
* Push an existing folder | * Push an existing folder | ||
cd existing_folder |cd /c/RHO_ERP_WEB | cd existing_folder |cd /c/RHO_ERP_WEB | ||
Line 24: | Line 21: | ||
git commit -m "Initial ERP Web commit" | git commit -m "Initial ERP Web commit" | ||
git push -u origin master | git push -u origin master | ||
− | |||
* Push an existing Git repository | * Push an existing Git repository | ||
cd existing_repo | cd existing_repo | ||
Line 31: | Line 27: | ||
git push -u origin --all | git push -u origin --all | ||
git push -u origin --tags | git push -u origin --tags | ||
− | |||
* Merge Development Branch into master | * Merge Development Branch into master | ||
git checkout master | git checkout master | ||
Line 50: | Line 45: | ||
git push -u origin main | git push -u origin main | ||
− | ssh-keygen -t ed25519 -C " | + | ssh-keygen -t ed25519 -C "[[/cdn-cgi/l/email-protection|[email protected]]]" |
ls -al ~/.ssh | ls -al ~/.ssh | ||
eval `ssh-agent -s` | eval `ssh-agent -s` | ||
Line 58: | Line 53: | ||
git merge --no-ff --no-commit test | git merge --no-ff --no-commit test | ||
git clone --single-branch --branch <branchname> <remote-repo> | git clone --single-branch --branch <branchname> <remote-repo> | ||
− | git clone --single-branch --branch richard/main | + | git clone --single-branch --branch richard/main [[/cdn-cgi/l/email-protection|[email protected]]]:TACMS/erp.git |
− | + | * COMMIT and MERGE with main branch | |
− | * COMMIT and MERGE with main | ||
git add . | git add . | ||
git commit -m "Start working on User List" | git commit -m "Start working on User List" |
Revision as of 06:39, 23 May 2021
GIT
- Add Public SSH Key
ssh-keygen -t ed25519 -C "RHO_ERP_WEB_KEY" nano /c/Users/user/.ssh/id_ed25519.pub
- Git global setup
git config --global user.name "Allen 123" git config --global user.email "[email protected]"
- Create a new repository
git credential-manager clear git clone https://gitlab.rhomicom.com/richard/rho_erp_web.git cd rho_erp_web touch README.md git add README.md git commit -m "add README" git push -u origin master
- Push an existing folder
cd existing_folder |cd /c/RHO_ERP_WEB git init git remote add origin https://gitlab.rhomicom.com:8443/richard/rho_erp_web.git git add . git commit -m "Initial ERP Web commit" git push -u origin master
- Push an existing Git repository
cd existing_repo git remote rename origin old-origin git remote add origin https://gitlab.rhomicom.com:8443/richard/rho_erp_web.git git push -u origin --all git push -u origin --tags
- Merge Development Branch into master
git checkout master git merge richard/main
git stash # Then, pull in the changes from origin. git fetch origin && git rebase origin/(branch name) # Next, add the stash back in to your working directory: git stash pop
echo "# mobileapp" >> README.md git init git add README.md git commit -m "first commit" git branch -M main git remote add origin https://github.com/TACMS/mobileapp.git git push -u origin main
ssh-keygen -t ed25519 -C "[email protected]" ls -al ~/.ssh eval `ssh-agent -s` ssh-add ~/.ssh/id_ed25519 nano ~/.ssh/id_ed25519
git merge --no-ff --no-commit test git clone --single-branch --branch <branchname> <remote-repo> git clone --single-branch --branch richard/main [email protected]:TACMS/erp.git
- COMMIT and MERGE with main branch
git add . git commit -m "Start working on User List" git push -u origin richard/main git checkout main git merge --no-ff --no-commit richard/main git commit -m "Start working on User List" git push -u origin main git checkout richard/main git pull origin main git push -u origin richard/main