1950
Comment: Manage homedir
|
1952
|
Deletions are marked like this. | Additions are marked like this. |
Line 40: | Line 40: |
* Setup repo, with no-checkou {{{ git clone --depth 2 --no-checkout repo-to-clone . }}} |
* Setup repo, with no-checkout {{{ git clone --depth 2 --no-checkout repo-to-clone . }}} |
Line 49: | Line 49: |
* switch back to main branch {{{ git checkout dev }}} * Merge original file back into dev if required. {{{ git merge original-201802 }}} |
* switch back to main branch {{{ git checkout dev }}} * Merge original file back into dev if required. {{{ git merge original-201802 }}} |
Git
- Linux distributed version controll.
- Notes on using and setting up on Ubuntu.
How to setup GIT private server
- Log into server, create git account, set it to use git-shell (no login), add .ssh/authorized keys for access with no password.
Create repo with $ git init --bare repository
1. On client edit
- --bare can't be used
- Setup .ssh/config, see example if using port, and can even use specific port.
Host githost HostName git.host.de Port 4019 User git
On client pc clone with $ git clone githost:repository
- #(edit some files
git commit -a # Commit all changes to the local version of the repository
git push origin master # Push changes to the server's version of the repository
Nice Git prompt in Linux bash
Git submodule
- Home dir add code as seperate submodule git
on server # sudo -u git git init --bare NewRepo
on pc code$ git submodule add git@git.server:NewRepo
Cleanup local branches already merged into Master
Check what has not been merged with git branch --no-merged
Delete branch git branch -d xxx
. All in one git branch --merged master | grep -v "\* master" | xargs -n 1 git branch -d
Manage homedir on new server from existing git repo
Setup repo, with no-checkout
git clone --depth 2 --no-checkout repo-to-clone .
- Create a branch to keep current files local
git branch original_201802 git checkout original_201802 git add . git commit
switch back to main branch
git checkout dev
Merge original file back into dev if required.
git merge original-201802
...