Setting up & Operating GIT repositories

Client Setup

identify yourself

git config $USER@$HOSTNAME
git config $USER@$HOSTNAME
#git config --edit

git config --global $USER@$HOSTNAME
git config --global $USER@$HOSTNAME
#git config --global --edit

and check

git config
git config

git config --global
git config --global

define some better defaults — FF + REBASE MANUALLY

#git config pull.rebase false       # merge (the default strategy)
#git config pull.rebase true        # rebase

git config pull.ff only         # fast-forward only
git config pull.rebase false        # no rebase

#git config --global pull.rebase false  # merge (the default strategy)
#git config --global pull.rebase true   # rebase

git config --global pull.ff only    # fast-forward only
git config --global pull.rebase false   # no rebase

moar options

#git config --global push.default simple
#git config --global core.editor elvis

Basic usage

see the last commit

git log -1
git log --stat -1
git log --patch -1

see past commits

git log
git show COMMIT --stat

see what’s been staged for commit already

git diff --cached --stat
git diff --cached
git status -v

Dirty speed-up tweaks

for text or html files, eventually avoid comments

git config --global 'commit -a --allow-empty-message -m ""'
git config --global 'commit --allow-empty-message -m ""'
git config --get-regexp alias

–or– directly use the shell aliases for that matter

alias push='git commit -a --allow-empty-message -m "" && git push'
alias commit='git commit --allow-empty-message -m ""'
alias stat='git diff --stat --cached origin/master'

Fetching a repository


git clone
#git clone

Gitlab on-premises

git clone ssh://git@gitsrv/home/git/project.git
#git clone http://git@gitsrv/home/git/project.git
#git clone https://git@gitsrv/home/git/project.git

GIT in production

update the list of branches and switch to the new revision

    git fetch -a
    git checkout release-1.1.0
    git pull

and restart the application


you’ve commited while loosing sync, and when trying to pull, you get

    fatal: Not possible to fast-forward, aborting.


    git pull --rebase

another similar use-case

    "hint: Updates were rejected because the remote contains work that you do"

==> either the former or

    git merge

and eventually compare git log output, identify the additional commits there are and show diffs against those

    git diff-tree -p COMMIT


don’t forget to define your trust store, you need to do that manually on NetBSD

git config --global http.sslVerify true

raw control chars

when doing git diff


==> either find out where on earth the default behavior for less got changed (some old slackware release doing -M?… –or– enable “raw” control characters in your PAGER

git config --global core.pager "less -r"

share a repo across the file-system

If you need to share a repo with another user, using group permissions as such

#homedir does not need to be writable, but executable
chmod 750 /home/gollum/
cd /home/gollum/

#now making the repo writable for the group
chown -R gollum:gollum pub.git/
find pub.git/ -type d -exec chmod 770 {} \;
find pub.git/ -type f -exec chmod 660 {} \;
find pub.git/ ! -type d ! -type f

you need to fsck/prune/repack/fsck after changing perms. The link (see below) even says you need to do it on both sides, local and remote.

git fsck
git prune
git repack
git fsck


How to show what a commit did?

8.1 Customizing Git - Git Configuration

Show File Diffs When Viewing Git Log

The Git Hater’s Guide

10 things I hate about Git

List Git aliases

How to see the changes in a Git commit?

git: can’t push (unpacker error) related to permission issues


Why use –ff-only over –rebase


fetch in git doesn’t get all branches

How do I show the changes which have been staged?

git-diff - Show changes between commits, commit and working tree, etc

Git - deleted some files locally, how do I get them from a remote repository

Exploring History

2.3 Git Basics - Viewing the Commit History

How To Switch Branch on Git

How to Stash Changes in Git

Copyright © 2024 Pierre-Philipp Braun