- git difftool & mergetool
- Auto-link from GitHub to Jira tickets
git diff command prints changes to stdout, normally to the terminal screen.
Set up a visual diff and merge program for use with
git difftool and
Changes in binary files do not show well in common diff tools and can take a long time for them to compute visual diffs.
This is easily avoided using the -d option:
git difftool -d
This shows all changed files in the diff program, and you can view and skip files there as appropriate.
gedit ~/.gitconfig →
[diff] tool = meld [difftool] prompt = false [difftool "meld"] cmd = meld "$LOCAL" "$REMOTE" [merge] tool = meld [mergetool "meld"] cmd = meld "$LOCAL" "$MERGED" "$REMOTE" --output "$MERGED"
GitHub itself does not linkify text like “ICU-23456” to point to the Jira ticket. You can get links via browser extensions.
Install the Jira HotLinker from the Chrome Web Store.
- Jira instance url: https://unicode-org.atlassian.net/
- Locations: https://github.com/
Install from the Mozilla Firefox Add-ons site: https://addons.mozilla.org/en-US/firefox/addon/github-jira-issue-linkifier/