Setting up & Operating GIT repositories

Client Setup

identify yourself

echo $USER
echo $HOSTNAME

git config user.name $USER@$HOSTNAME
git config user.email $USER@$HOSTNAME
#git config --edit

git config --global user.name $USER@$HOSTNAME
git config --global user.email $USER@$HOSTNAME
#git config --global --edit

and check

git config user.name
git config user.email

git config --global user.name
git config --global user.email

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
git diff PREVIOUS-COMMIT COMMIT

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 alias.nc 'commit -a --allow-empty-message -m ""'
git config --global alias.ci '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

Github

git clone git@github.com:ACCOUNT/REPO.git
#git clone https://github.com/pbraun9/slackbuilds.git

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

Troubleshooting

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

ca

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

ESC[32m+ESC[mESC[32m#

==> 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.