diff options
Diffstat (limited to 'cheatsheet.txt')
-rw-r--r-- | cheatsheet.txt | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/cheatsheet.txt b/cheatsheet.txt index 8e18dd1..42655a1 100644 --- a/cheatsheet.txt +++ b/cheatsheet.txt @@ -1,6 +1,9 @@ Global Setup - See also Submodules below. + See also Submodules and History Cleanup configurations below. + + git config --global user.name "First Last" + git config --global user.email first@example.com git config --global color.status.branch magenta @@ -16,13 +19,27 @@ Global Setup # Enable hooks globally. # - git config --global core.hooksPath <git-project-dir>/hooks + git config --global core.hooksPath <bdep-util-project-dir>/bdep-util/git-hooks # Override the global hooks with the repository-specific hooks (run in a # repository directory). # git config core.hooksPath .git/hooks +Commit Messages + +1. Separate subject from body with a blank line +2. Limit the subject line to 78 characters +3. Capitalize the subject line +4. Do not end the subject line with a period +5. Use the imperative voice in the subject line (e.g., "Implement foo" rather + than "Implemented foo") +6. No articles (a/the) in the subject line +7. Wrap the body at 78 characters +8. Unless this is already captured in the commit payload (e.g., in + code comments, documentation, etc) use the body to explain what + and why + Undo (move to index) last commit git reset --soft HEAD~ @@ -116,7 +133,9 @@ History Cleanup that usually the result of the git merge command. Note: make sure you have rerere enabled for this process to work - smoothly (~/.gitconfig). + smoothly: + + git config --global rerere.enabled true Note: if you are just learning this procedure, make a local backup copy of your repository in case things go badly and you need to |