Random Developments And Random Toys

Couple awesome git tricks

  • For easier conflict resolution use diff3 format. This guy did a good job explaining it.

  • Found something possibly obsolete but you are not entirely sure if it’s true? Search history for mentions of keyword using the -S flag:

    git log -S "keyword"

    This will display log entries of commits that have “keyword” added or removed from the repository.


Want to read / submit comments? Click the button below to enable. Do note that site is using Disqus comments.