Category: git

Git log with full diff 0

Git log with full diff

Git log full-text with search git log -p | grep <SEARCH_STRING> Git log of a single file $> git log -p --follow <PATH/FILENAME> Git log of a single commit todo Git diff between two branches...

Abort a merge operation with conflicts 0

Abort a merge operation with conflicts

Let say you are working on branch 4.3, and by accident you merge the wrong branch name instead : git merge origin ABC Your working tree is now completely broken with failed merges since...

How to setup an automated git email notifier server 0

How to setup an automated git email notifier server

  (1) sudo wget http://git.icir.org/git-notifier.git/blob_plain/refs/heads/master:/git-notifier -O /usr/share/git-core/contrib/hooks/git-notifier chmod +x /usr/share/git-core/contrib/hooks/git-notifier (2) Add ssh private key to your .shh folder so git operations dont ask for password. This will be automated. (3) For each new...