#1418

[Git] How-To

Olivier | How-To | 37

To test GIT commands :
learngitbranching.js.org

Create a new branch (local and remote) :

git checkout -b new_branch #< create a new local branch with a copy of your code
git push origin new_branch #< pushes to the server
git push --set-upstream origin new_branch

To define the origin after pushing the new branch :

git branch --set-upstream-to=origin/<branch> new_branch

Clone into specific directory :

git clone http://.... LOCAL_DIRECTORY_NAME

In case of issue with ‘too long filename’ :

git config --system core.longpaths true

Delete a branch (local and remote) :

git branch -d branch_name
git push origin :<branch_name>

Rebase a branch (local and remote) :

rebase branch feature1 to develop

git checkout feature1
git pull
git rebase develop
git pull
git push origin feature1

To merge branch AAA into develop :

git checkout AAA
git pull
git checkout develop
git pull
git merge AAA
git status
git push

This will merge the branch AAA into develop
To do the same without auto commit, add “–no-commit”

Git

GitHub – ansible-role-nginx: Ansible role to install and manage nginx configuration PHP 5.6 on CentOS/RHEL 7.2 and 6.8 via Yum | Webtatic.com

37 thoughts on “[Git] How-To”

Olivier says:

25/11/2016 at 13:20

To ignore SSL certificate :
One shot :

git -c http.sslVerify=false clone https://domain.com/path/to/git

To disable :

git config http.sslVerify false
git config --global http.sslVerify false

Olivier says:

01/12/2016 at 16:01

Change Git remote URL :
https://help.github.com/articles/changing-a-remote-s-url/

Reply
- OLIVIER COMBE says:
  
  15/02/2024 at 10:00
  
  Change remote origin:
```
git remote set-url origin https://github.com/new/....git
```
  Reply

Olivier says:

06/12/2016 at 08:11

To delete a tag :

git tag -d TAG_NAME
git push origin :refs/tags/TAG_NAME

Olivier says:

18/01/2017 at 09:31

Force git to overwrite everything on pull? (back to origin)
```
git fetch origin <BRANCH_NAME>
git reset --hard FETCH_HEAD
git clean -df
```
Reply
Olivier says:

14/03/2017 at 14:17

To retrieve the latest tag :
```
git describe --tags `git rev-list --tags --max-count=1`
```
Reply

Olivier says:

17/03/2017 at 14:54

git 2.x on CentOS 6

yum install http://opensource.wandisco.com/centos/6/git/x86_64/wandisco-git-release-6-1.noarch.rpm
yum install git
git --version

Olivier says:

20/06/2017 at 10:56

Splitting a subfolder out into a new repository : https://help.github.com/articles/splitting-a-subfolder-out-into-a-new-repository/

Reply
- OLIVIER COMBE says:
  
  05/07/2022 at 10:10
```
pip3 install git-filter-repo
```
  check https://stackoverflow.com/a/69356543 in case of error
  
  Reply
Olivier says:

26/07/2017 at 14:33

Update only one file to a specific commit :
```
git fetch
git checkout -m <revision> <yourfilepath>
```
Reply
Olivier says:

20/09/2017 at 09:59

to retrieve current branch :
```
git rev-parse --abbrev-ref HEAD
```
Reply

Olivier says:

20/09/2017 at 10:01

Commit all files recursively :

find . -name 'pom.xml' -type f -print0 | xargs -0 git add
find . -name 'pom.xml' -type f | xargs git add
find . -name 'pom.xml' -type f | xargs git add -u

Olivier says:

11/12/2017 at 15:39

in ~/.gitconfig

[credential]
        helper = store --file ~/git.store

in ~/git.store :

https://USERNAME:PASSWORD@GIT_SERVER_URL

Olivier says:

21/12/2017 at 15:00

create git repo from dir with existing sources :

git init
git add .
git commit -m 'message'
git remote add origin <url>
git push -u origin master

Olivier says:

08/02/2018 at 08:43

connect to gitlab using SSH key

* Generate SSH key on client machine
```
ssh-keygen -t rsa -C "your.email@example.com" -b 4096
```
* Add (public) key to gitlab profile (~/.ssh/id_rsa.pub by default)

* edit git config on client
```
vi ~/.ssh/config
```
```
Host my_git_repo.com
RSAAuthentication yes
IdentityFile ~/.ssh/id_rsa
```
* test the connection
```
ssh -T git@my_git_repo.com
```
* checkout using SSH :
```
git clone git@my_git_repo.com:My_GROUP/my_project.git
```
Reply
Olivier says:

23/02/2018 at 11:58

Issue git ‘SSL connect error’

update openssl & nss :

https://stackoverflow.com/questions/30678583/centos-6-6-curl-returns-error-when-connecting-to-some-ssl-site

Reply

Olivier says:

28/03/2018 at 10:16

Reset repo :

git checkout --orphan newBranch
git add -A  # Add all files and commit them
git commit -m "Initial commit"
git branch -D master  # Deletes the master branch
git branch -m master  # Rename the current branch to master
git push -f origin master  # Force push master branch to github
git gc --aggressive --prune=all     # remove the old files
git push -f origin master

Olivier says:

04/05/2018 at 20:18

cheat sheet : http://gitcheats.com/

Reply
Olivier says:

13/09/2018 at 14:04

Limit
git clone https://github.com/atom/atom -b v1.0.2 –depth=1

Reply

Olivier says:

03/07/2019 at 15:48

Revert a merge :

git reset --hard <COMMIT_BEFORE_MERGE>
git push <origin> <BRANCHNAME> --force

Olivier says:

28/11/2019 at 09:52

Remove large file from git history

# find large git pack file
ls -altrih .git/objects/pack/*

# check content 
git verify-pack -v .git/objects/pack/pack-HAAASSSSHHH.idx | sort -k 3 -n | tail -n 20


# remove file from histort
git filter-branch --index-filter 'git rm -r --cached --ignore-unmatch ./file_to_remove.ext' --prune-empty
# or
git filter-branch --index-filter 'git rm -r --cached --ignore-unmatch ./file_to_remove.ext' --tag-name-filter cat -- --all

# then :
git for-each-ref --format='delete %(refname)' refs/original | git update-ref --stdin
git reflog expire --expire=now --all
git gc --aggressive --prune=now

# push to remote repo 
git push origin --force --all

OLIVIER COMBE says:

28/06/2022 at 14:28

list large files, with size > 2Mb and not present in the last commit:

git rev-list --objects --all |   git cat-file --batch-check='%(objecttype) %(objectname) %(objectsize) %(rest)' |   sed -n 's/^blob //p' |   sort --numeric-sort --key=2 |   cut -c 1-12,41- | awk '$2 >= 2^20' |  $(command -v gnumfmt || echo numfmt) --field=2 --to=iec-i --suffix=B --padding=7 --round=nearest | grep -vF --file=<(git ls-tree -r HEAD | awk '{print $3}')

Olivier says:

19/06/2020 at 17:48

git error > git refusing to merge unrelated histories

Ensure shadow clone is not used to clone source before merge

Reply
Olivier says:

29/06/2020 at 16:51

Enable debug mode :
```
GIT_CURL_VERBOSE=1 GIT_TRACE=1 git clone ...
```
Reply
Olivier says:

02/07/2020 at 09:16

Enable color
```
git config --global color.ui true
```
Reply
Olivier says:

02/07/2020 at 09:17

Undo ‘git add’
```
git reset <file>
```
or
```
git reset
```
to unstage all changes

Reply
OLIVIER COMBE says:

10/11/2020 at 07:23

CentOS7 | Install Git 2.x
yum remove git* -y
yum -y install https://packages.endpointdev.com/rhel/7/os/x86_64/endpoint-repo-1.10-1.x86_64.rpm
yum install git -y

Reply
OLIVIER COMBE says:

09/12/2020 at 10:00

Overwrite git author :

https://stackoverflow.com/a/30737248

Reply

OLIVIER COMBE says:

26/05/2021 at 10:24

Setup proxy for Git :

git config --global http.proxy http://proxyUsername:proxyPassword@proxy.server:port

git config --global https.proxy http://proxyUsername:proxyPassword@proxy.server:port

OLIVIER COMBE says:

27/05/2021 at 08:44

Edit git config :
```
git config --global --edit
```
Reply
OLIVIER COMBE says:

01/06/2021 at 14:11

Error “RPC failed; curl 56 GnuTLS recv error (-110): The TLS connection was non-properly terminated.”
```
git config --global http.postBuffer 1048576000
```
Reply

OLIVIER COMBE says:

23/09/2021 at 15:09

Install Git from sources

Download sources

wget https://github.com/git/git/archive/refs/tags/v2.33.0.zip
unzip v2.33.0.zip -d git

Install dependencies (RHEL)

yum install zlib-devel autoconf gcc make libcurl-devel openssl* nss libxml2-devel openssl-devel y
yum groupinstall 'Development Tools' -y

Build sources

make configure
./configure --prefix=/root/git2
make && make install

OLIVIER COMBE says:

23/09/2021 at 15:11
```
alias git2=/root/git2/bin/git
```
Reply

OLIVIER COMBE says:

03/08/2022 at 15:26

Git repo cleanup

Migrate to LFS :
https://support.atlassian.com/bitbucket-cloud/docs/use-bfg-to-migrate-a-repo-to-git-lfs/

Repo Cleaner:
https://rtyley.github.io/bfg-repo-cleaner/

git clone --mirror https://.../my_project.git my_project
cd my_project
java -jar bfg-x.y.z.jar --strip-blobs-bigger-than 25M ./
git reflog expire --expire=now --all && git gc --prune=now --aggressive
git push

# Remove BitBucket proteted references
git show-ref | cut -d' ' -f2 | grep 'pull-request' | xargs -r -L1 git update-ref -d
git push

OLIVIER COMBE says:

04/01/2023 at 15:02

Install Gitv2 on RHEL/CentOS 8

https://linuxconcept.com/how-to-install-git-on-rhel-8-red-hat-enterprise-linux-operating-system/

Reply
OLIVIER COMBE says:

30/01/2024 at 08:06

Unix Store git credentials
```
git config --global credential.helper store

git colne ...
```
Reply
OLIVIER COMBE says:

28/10/2024 at 14:48

Create a tag from an existing commit hash
```
git tag -a v1.2 9fceb02 -m "Message here"
```
and then push tags:
```
git push --tags
```
Reply

[Git] How-To

Related Links :

37 thoughts on “[Git] How-To”

Leave a Reply to Olivier Cancel reply