Size: 8642
Comment:
|
← Revision 46 as of 2025-02-16 10:35:44 ⇥
Size: 8707
Comment:
|
Deletions are marked like this. | Additions are marked like this. |
Line 61: | Line 61: |
git clone ssh://git@git.server.net:1234/home/git/repository.git |
git
Git is a distributed version control and source code management (SCM) system.
SSH public key generation
Toggle line numbers
1 ls ~/.ssh
2 ssh-keygen # create ~/.ssh/id_rsa and ~/.ssh/id_rsa.pub keys
3 cat ~/.ssh/id_rsa.pub # shows key to be sent to the git server admin
4
Config
Toggle line numbers
1 git config --global user.name "John Doe"
2 git config --global user.email johndoe@example.com
3 git config --list
Local config for repository
Create repository
Edit .gitignore for Java
- *.jar
- *.war
- *.ear
- *.zip
Sample .gitignore
*~ .metadata *.class *.jar *.war *.ear *.zip target/
Clone repository
Toggle line numbers
1 git clone git@git.server.net:repository.git # by ssh
2 git clone ssh://git@git.server.net:1234/home/git/repository.git
3 git clone https://git.server.net/repository.git #by https
4 cd repository
Branch creation based on current branch
Toggle line numbers
1 git branch #show current branch
2 git checkout -b B/20130801/BRANCH-XYZ master # create new branch based on branch master
3 git branch -m B/20130801/BRANCH-XYZ B/20130801/BRANCH-ZZZ # rename local branch
4 git push origin B/20130801/BRANCH-ZZZ # push branch B/20130801/BRANCH-ZZZ to remote
5
Commit to remote branch
Toggle line numbers
1 git commit -am 'Message commit xyz ' --all #commit locally
2 git pull origin B/20130801/BRANCH-ZZZ # sync with remote branch
3 # fix conflicts and commit conflict resolution
4 git push origin B/20130801/BRANCH-ZZZ # send changes to remote branch
5 git commit -am 'Message commit asdf ' --all #commit locally
6 git pull --rebase origin B/20130801/BRANCH-ZZZ # sync with remote branch with rebase
7 # fix conflicts and commit conflict resolution
8 git push origin B/20130801/BRANCH-ZZZ # send changes to remote branch
9
Merge to other branch
Toggle line numbers
1 git checkout development
2 git checkout -b feature_branch origin/feature_branch
3 git add .
4 git commit -m "msg" # commit in feature branch
5 git checkout development
6 git pull origin development
7 git checkout feature_branch
8 git merge --no-ff development
9 git pull origin feature_branch
10 git push origin feature_branch
Reapply .gitignore
Setup git server on RHEL/Debian 12 bookworm
http://git-scm.com/book/en/Git-on-the-Server-Setting-Up-the-Server
Home folder for git user must have permissions only for that user.
Toggle line numbers
1 chown git . -R
2 chgrp git . -R
The bare repositories folders must have permissions only for git user.
Toggle line numbers
1 chown git . -R
2 chgrp git . -R
Toggle line numbers
1 sudo bash
2 adduser git
3 su git
4 cd
5 mkdir .ssh
6 cd .ssh
7 git --version # git version 1.7.1 git version 2.39.5
8
9 #generate and paste the pub key from my user on local machine
10 # ssh-keygen -f id_rsa -p
11 ssh-keygen -t rsa
12 cat ~/.ssh/id_rsa.pub #local machine
13
14 # in the git server
15 cd .ssh # git account
16 vim authorized_keys #git server, paste the content of id_rsa.pub
17 cd ~
18 chmod 700 .ssh/
19 chmod 600 .ssh/authorized_keys
20 ssh git@bitarus.allowed.org # test connection from local machine
21 vim /etc/passwd #change shell for git user
22 git:x:505:505::/home/git:/usr/bin/git-shell
23
24 # create project on git server
25 cd /home/git
26 mkdir hello.git
27 cd hello.git
28 git --bare init
29 chown git . -R
30 chgrp git . -R
31
32 #create project on local machine
33 cd ~
34 cd gitRepository
35 mkdir hello
36 cd hello
37 git init
38 touch README.md
39 git config --global user.email "you@example.com"
40 git config --global user.name "Your Name"
41 git add .
42 git commit -m 'initial commit'
43 git config --list #check config
44 git remote add origin ssh://git@bitarus.allowed.org:1234/home/git/hello.git
45 git push origin master
46 git log
Revert file to original
Toggle line numbers
1 git checkout -- testFile.txt
Github change from https to ssh
Toggle line numbers
1 git remote -v # check current remote repository
2 git remote set-url origin git@github.com:user/project.git
Delete local branch development and checkout remote development branch
Toggle line numbers
1 git branch -d development
2 git checkout -b development origin/development # get local branch from remote branch
3
Switch between branches
Get remote branch to local branch
Toggle line numbers
1 git fetch origin
2 git checkout -b wiki origin/wiki # local branch wiki from remote origin/wiki
3
Revert to HEAD revision
Toggle line numbers
1 git reset --hard HEAD
Make colors show properly on git diff and git log
Toggle line numbers
1 git config --global core.pager 'less -R'
Change commit message before a push
Toggle line numbers
1 git commit --amend
Files in branch changed between revisions
Toggle line numbers
1 git diff --name-only hash1 hash2
2 git diff --name-only hash1 HEAD
Clean untracked files and folders
Toggle line numbers
1 git clean -n -d
2 git clean -f -d
Reset to version in remote repository
Toggle line numbers
1 git fetch origin
2 git reset --hard origin/master
Git for windows (git bash)
Join several commits not pushed
Use the git rebase.
Toggle line numbers
1 git rebase -i origin/master
Pick (choose) several commits and put them all with the "squash" commit that usually is the most recent one. It may be cancelled using git rebase --abort.
Difference between remote and local branch
Toggle line numbers
1 git diff origin/master..master
GitFlow
New development (new features, non-emergency bug fixes) are built in feature branches: Feature branches are branched off of the develop branch, and finished features and fixes are merged back into the develop branch when they’re ready for release When it is time to make a release, a release branch is created off of develop: The code in the release branch is deployed onto a suitable test environment, tested, and any problems are fixed directly in the release branch. This deploy -> test -> fix -> redeploy -> retest cycle continues until you’re happy that the release is good enough to release to customers. When the release is finished, the release branch is merged into master and into develop too, to make sure that any changes made in the release branch aren’t accidentally lost by new development. The master branch tracks released code only. The only commits to master are merges from release branches and hotfix branches. Hotfix branches are used to create emergency fixes: They are branched directly from a tagged release in the master branch, and when finished are merged back into both master and develop to make sure that the hotfix isn’t accidentally lost when the next regular release occurs.
Create local branch from commit in current branch
Toggle line numbers
1 git checkout -b test <commit sha1>
Show differences in added/staged files with git add
Toggle line numbers
1 git add filex
2 git status
3 git diff --staged
4 git diff --cached
Stash
Update old commit message already pushed
Toggle line numbers
1 # mark as reword the commit to update
2 git rebase -i HEAD~2
3 reword 9b5ca7af9 Old commit
4 pick 7331d8be5 [prefix] good commit with prefix
5 # will show new console to add the missing prefix
6 # [prefix] Old commit
7 git log
8 # replace pick with reword each commit that needs to be changed
9 git push origin develop --force