git.md

GIT tips

On newly installed Windows 10 git pull got the error

> git pull
fatal: detected dubious ownership in repository at 'repo_path'
'repo_path' is owned by:
        (inconvertible) (UUID)
but the current user is:
        PC-NAME/User (UUID)
To add an exception for this directory, call:

        git config --global --add safe.directory repo_path
		
# fix
> takeown /f <path to the repository> /r /d y
> git pull
remote: Enumerating objects: 123, done.
remote: Counting objects: 100% (123/123), done.
remote: Compressing objects: 100% (30/30), done.
...

Pre-push hook - block any pushing into master branch

#!/bin/sh

protected_branch='master'
current_branch=$(git rev-parse --abbrev-ref HEAD)

if [ $protected_branch = $current_branch ]
then
  echo "`$protected_branch` is protected branch: push is not allowed!"
  exit 1
fi

Change author name and email for last commit

git commit --amend --author="First Last <[email protected]>" --no-edit

Pre-commit hook

#!/usr/bin/env bash

declare -a disallowed=("import package" "from package import")

git diff --cached --name-status | while read x file; do
    if [ "$x" == 'D' ]; then continue; fi
    for stop_line in "${disallowed[@]}"
    do
        if egrep "${stop_line}" $file ; then
            echo "ERROR: Disallowed expression \"${stop_line}\" in file: ${file}"
            exit 1
        fi
    done
done || exit $?

Delete last commit and changes

git reset --hard HEAD~1
git push --force

Edit commits

git rebase -i HEAD~3
git push --force

GitHub fork update

git remote add upstream https://github.com/user/repo.git
git remote -v
git fetch upstream
git checkout master
git rebase upstream
git push

GitHub fork rebase

git checkout master
git rebase branch_name
git push --force

Commit to branch

git cherry-pick 18db55bb31d8dffffd94af2f553eb4e982cd9785

# if conflicts
git add -A .
git commit -c 18db55bb31d8dffffd94af2f553eb4e982cd9785

Delete remote tag

git push --delete origin tagname

Delete branch

# local
git branch -d branch_name

# remote
git push origin --delete branch_name

Switch to tag

git tag
git checkout -b version2 v2.0.0

Commit with date

git commit --date="12/09/2017T10:00:05" -m "Commit message"

Commit with date - surprise

git commit --date="3 day ago" -m "Commit message"