In an effort to improve my Git commit messages I’ve decided to employ a commit message template. This starts with a file in my Home directory vi ~/.git-commit-msg-template Three simple lines beginning with # so if I ignore them, so does Git. # What this commit does # Why this commit is being made # […]
Version Control
Git – list of conflicted files
git diff –name-only –diff-filter=U from SO
DiffMerge, Git and OS X
git config –global diff.tool diffmerge git config –global difftool.diffmerge.cmd ‘diffmerge “$LOCAL” “$REMOTE”‘ git config –global merge.tool diffmerge git config –global mergetool.diffmerge.cmd ‘diffmerge –merge –result=”$MERGED” “$LOCAL” “$(if test -f “$BASE”; then echo “$BASE”; else echo “$LOCAL”; fi)” “$REMOTE”‘ git config –global mergetool.diffmerge.trustExitCode true Now git getdiff is available just as git diff # diff the local file.m against the checked-in version git difftool file.m # diff the local […]
Oh-My-Zsh Git Aliases
g git gst git status gd git diff gl git pull gup git pull –rebase gp git push gd git diff gc git commit -v gc! git commit -v –amend gca git commit -v -a gca! git commit -v -a –amend gco git checkout gcm git checkout master gr git remote grv git remote -v […]
Git Workflow – Lynda/Skoglund
KS git checkout master git pull git fetch git merge origin/master git checkout -b feedback_form git add feedback.html git commit -m “Add customer feedback form” git fetch git push -u origin feedback_form LDC git checkout master git pull git checkout -b feedback_form origin/feedback_form git log git show 84j34df8 git commit -am “Add something else to […]
Ignore Files/Directories – SVN
# ———————————————————— # Ignoring files/directories happens in the same fashion # Ignore all the .jpg files in the /trunk/images/ directory # ————————————————————– # switch to trunk/images cd trunk/images/ # Edit the properties for the current directory svn propedit svn:ignore . # Opens an editor (SVN_EDITOR, EDITOR) # if no editor is set, run the following […]
