#versionning #selfhosting

Git

→ Configs

In ~/.gitconfig:

[user]
        name = parisni
        email = foo@bar.baz
[alias]
        history = log --graph --pretty=tformat:'%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%an %ar)%Creset'  --name-status -p                                                          review = !git-review
        a = add
        p = push
        d = diff
        st = status
        co = checkout
        cm = commit -m
        ci = commit
        br = branch
        brs = branch --show-current
        undo = !git reset --hard && git clean -fd
        se=!git rev-list --all | xargs git grep -F
        ll=log --oneline

[core]
        editor = vim

→ Branches

→ Récupérer un fichier de puis une autre branche source

# cherche depuis la branche distante server le fichier bookmark
git checkout origin/server   -- .w3m/bookmark.html

→ Revenir a un commit

Si j'ai fait fausse route et que j'ai poussé les modif en ligne, je peux revenir en arriere et faire de ce commit la version actuelle.

# retourner au commit f359
git revert --no-commit f359b96a1e1e680cf76ea06094e112b92b936b5e..HEAD
git commit

→ Explorer les données d'un commit

# retourner au commit f359
git checkout f359b96a1e1e680cf76ea06094e112b92b936b5e
# puis par exemple pour retourner dans la branche master
git checkout master

→ cesser de tracker un dossier

Ajouter au .gitignore le dossier. Puis lancer la commande:

git rm -r --cached <le-dossier>

cela ne supprimera pas le dossier

→ Annuler les modifs d'un fichier

git checkout -- fichier-a-annuler-les-modif

→ Revenir à un certain commit pour un certain fichier

git checkout <commit id> -- fichier-a-annuler-les-modif

→ Rebase la branche master

git checkout master
git fetch --all # cf https://www.reddit.com/r/git/comments/8j70vv/should_i_fetch_before_pull/
git pull
git checkout branche-de-travail
git rebase master # evite d'avoir les commit de master par dessus son history; ils seront mis avant les modifs de la branche

→ show history of file

git log -p filename
# OR
git show -2 filename # means number of history commit

→ git rename branch

this will rename the branch

git branch -m gitlab/dev gitlab-dev

→ git push remote

# this allows to push on an other remote, on the associated branch
git push <other-remote> <branch-to-push>
# this allows to push on a specific remote branch git push <other-remote> <branch-to-push>:<other-branch-to-push-on>

→ Supprimer des fichier dans un depot

# permet de supprimer le fichier spark-meta/target/spark-meta-0.0.1.SNAPSHOT-shaded.jar
# de tout l´historique
git filter-branch --force --index-filter 'git rm --cached --ignore-unmatch spark-meta/target/spark-meta-0.0.1-SNAPSHOT-shaded.jar' --prune-empty --tag-name-filter cat -- --all

→ Renommer un vieux commit

En utilisant magit:

  1. désactiver les éventuels git-hooks (dans .git/hooks/pre-commit)
  2. rebase (r)
  3. choisir --preserve-merge (-p)
  4. choisir rename commit ( w )
  5. choisir C-c C-c et renommer le commit
  6. éventuellement, gérer les conflits, puis continuer le rebase

→ Rebase et priorité sur des conflits

Par defaut, le rebase choisit les fichiers dans la branche yours. Il va écraser des éventuelles modifications locales. On peut changer ce comportement par defaut:

git rebase -X ours <branch>

→ Récupérer une branche remote en local

git checkout --track <remote>/<branch>

→ Remove submodule

submodule="folder/submodule"

git rm "$submodule"
rm -rf ".git/modules/$submodule"
git config -f ".git/config" --remove-section "submodule.$submodule" 2> /dev/null

# Commit the change
git commit -m "Remove submodule $submodule"

# Restart the state
git submodule deinit -f .
git submodule update --init

→ Undo local commit

git reset HEAD~1 # where 1 is the number of commit to resume

→ Undo several local commit and remove local files

git reset --hard <commit-id>

→ bash prompt

  1. Add https://raw.githubusercontent.com/git/git/master/contrib/completion/git-prompt.sh to ~/.git-prompt.sh

  2. add this to .bashrc

if [ -f ~/.git-prompt.sh ]; then
. ~/.git-prompt.sh
GIT_PS1_SHOWDIRTYSTATE=true
GIT_PS1_SHOWCOLORHINTS=true
GIT_PS1_UNTRACKEDFILES=true
PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\W\[\033[00m\]$(__git_ps1 " (%s)")\$ '
fi

→ Show difference between two tags

git diff tag1 tag2

# for only one file
git diff tag1 tag2 -- some/file/name

→ Delete all branch but master

git branch | grep -v "master" | xargs git branch -D

→ Delete a tag

# local
git tag --delete 1.6.3
# remote
git push --delete origin <tag>

→ Restore a file or path from a commit

git restore --source=<commit-id> path/to/thing

→ Blame omit commits

# to get the full sha1
git blame --line-porcelain path/to/file

# then omit it by copy/paste sha1 into file
git blame --ignore-revs-file=.git-blame-ignore-revs path/to/file

→ Restore a stash file

git diff stash^! -- <filename> | git apply

→ git server

→ Configs

→ Don't consider file mode (chmod)

git config core.fileMode false

→ Undo all changes including new files

git clean -fd

→ diff de fichiers

Below won't need a git folder

# eq to Linux diff
git diff --no-index --color-words <pathA> <pathB>
# eq to git status
git diff --no-index --name-status <pathA> <pathB>

→ avoid merge conflicts

→ resources

→ merge tool

→ Alias

React ?

This page was last modified: