Git Code Diary Entries

This is part of the Semicolon&Sons Code Diary - consisting of lessons learned on the job.

• After making modifications on server ensure git repo has not changes
• Avoid conflicts by reverting reverts
• Be careful not to confuse remote names with branches
• Be specific about files vs folders in gitignore
• Cherry pick
• Debugging and understanding gitignore syntax
• General git tips
• Git bisect
• Git might ignore file renames that differ only in character case
• How rebase works and when to use it
• How to diff a file at a certain time in the past
• How to find the commit that added certain data to a file
• How to list commits that deleted files in git
• How to override conflicts and take your version
• How to reduce conflicts in git
• How to revert numerous commits
• How to show a file in specific branch
• How to use patches instead of stashes
• In merges head is always the current branch
• Never merge a risky feature till YOU are ready to deploy and babysit it
• Only run reset hard after committing desired files
• Reverting a merge
• Search in git history
• See commits changing a particular line
• Show changes a colleague made
• Tags
• Understand gits behavior across multiple remote nodes
• Use gitk for detailed easy to parse histories of individual files
• Use no ff when you want to preserve the fact of the merge
• What does git reset do
• What is git reflog
• What is the difference between tilde and caret
• Workflow for big code reformats or reorderings