git utils commands etc.

git utils.md

delete all commits by a certain username

https://stackoverflow.com/questions/8058509/github-how-would-you-delete-all-commits-by-a-certain-username

keep changes

git filter-branch --commit-filter '
    if [ "$GIT_AUTHOR_NAME" = "Darl McBribe" ];
    then
            skip_commit "$@";
    else
            git commit-tree "$@";
    fi' HEAD

list authors of a git repository including commit count and email

https://gist.github.com/wumpz/5846559

git shortlog -e -s -n

git shortlog -s -n --all --no-merges

add --no-merges to exclude statistics from merge commits.

keep the local file or the remote file during merge using Git and the command line.md

https://stackoverflow.com/questions/6650215/how-to-keep-the-local-file-or-the-remote-file-during-merge-using-git-and-the-com

Using git mergetool

If you configure a mergetool like this:

git config mergetool.cp.cmd '/bin/cp -v "$REMOTE" "$MERGED"'
git config mergetool.cp.trustExitCode true

Then a simple

git mergetool --tool=cp
git mergetool --tool=cp -- paths/to/files.txt
git mergetool --tool=cp -y -- paths/to/files.txt # without prompting

See the number of lines changed with git.md

To see the number of lines changed in the current working directory:

git diff --stat=10000

The output will look something like this:

1 file changed, 1 insertion(+), 1 deletion(-)

To see the number of lines changed in a git commit:

git diff --stat=10000 <commit>

This means you can see the number of lines changed for the most recent git commit:

git diff --stat=10000 HEAD~

To remove a dirty working directory from the diff, use git stash:

git stash

Pop the stash to restore it:

git stash pop