Local tooling configs for git and Github


  1. git difftool & mergetool
    1. Linux example
      1. Linux meld
  2. Auto-link from GitHub to Jira tickets
    1. Chrome Jira HotLinker
    2. Safari extension from SRL
    3. Firefox extension from JefGen

git difftool & mergetool

The 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 git mergetool.

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.

Linux example


Linux meld

gedit ~/.gitconfig

    tool = meld
    prompt = false
[difftool "meld"]
    cmd = meld "$LOCAL" "$REMOTE"
    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.

Chrome Jira HotLinker

Install the Jira HotLinker from the Chrome Web Store.

Configuration Options:

  • Jira instance url: https://unicode-org.atlassian.net/
  • Locations: https://github.com/

Safari extension from SRL


Firefox extension from JefGen

Install from the Mozilla Firefox Add-ons site: https://addons.mozilla.org/en-US/firefox/addon/github-jira-issue-linkifier/

Source: https://github.com/jefgen/github-jira-linkifier-webextension