henrik-leppa / hfl-git-gui-config

My configurations for Git GUI (and a few rules for Git in general)

HFL Git GUI Config 1.0.0

Henrik Franciscus Leppä's (HFL) configurations for Git GUI (and a few rules for Git in general).

Git GUI and Gitk are useful tools for working with Git, because they allow you to see the commit tree and pick which changes to stage, along with many other things.

Unfortunate, they do not come with many tools/commands out of the box, and they even lack "Applications" menu icons on some Linux distributions. This repository is meant to fix that.

Tools include:

• "Checkout (assume remote: origin)"
• "Clean -- All"
• "Clean -- One File"
• "Commit -- Undo"
• "Fetch All Branches And All Submodules"
• "Fetch And Fast-Forward All Branches"
• "Filesystem Check -- Unreachable Objects"
• "Help with tools"
• "Log -- Unpushed"
• "Merge (No Fast-Forward)..."
• "Merge -- Abort"
• "Merge -- Continue"
• "Open Terminal"
• "Rebase (automatic)"
• "Rebase (get command for interactive)..."
• "Rebase -- Abort"
• "Rebase -- Continue"
• "Reference Log"
• "Reference Log (Reversed)"
• "Run Command In 'Commit Message' Field"
• "Stash -- Apply By Index..."
• "Stash -- Apply By Name..."
• "Stash -- Drop By Index..."
• "Stash -- Drop By Name..."
• "Stash -- List"
• "Stash -- Pop By Index..."
• "Stash -- Pop By Name..."
• "Stash -- Push Unstaged..."
• "Stash -- Push..."
• "Tag -- Delete"
• "Tag -- List With Message"
• "Write Commit Template"

MIT License

Changelog

Prerequisites

• Git GUI (git-gui)

  • Comes built-in with most Git distributions.

• Shell scripts:

  • git-fetch-all-recur - How to git fetch everything - Code Yarns

  • git-ffwd-update - muhqu's Answer - Can "git pull --all" update all my local branches? - Stack Overflow

  • git-named-stash - henrik-leppa - GitHub

  • (These scripts need to be installed in a directory found in PATH environment variable. They should not have file extensions in their filenames.)

Setup

1. Edit gitconfig.txt:

   • Replace all instances of string: ~/INSERT/PATH/TO/REPO/HERE/gitconfig.txt with your path to gitconfig.txt file.

   • Comment out or remove any rules you don't like under: [core], [color], [init], and [gui] sections.

   • (Add your own tools, if you want.)

2. Link to gitconfig.txt file in ~/.gitconfig by running the following in the terminal:

   git config --file ~/.gitconfig include.path '~/INSERT/PATH/TO/REPO/HERE/gitconfig.txt'

3. Optional: Add launcher to Linux "Applications" menu:

   • Note: This is intended for at least Linux Mint, but may work on other Ubuntu-based distros as well.

   • Link git-gui.desktop to ~/.local/share/applications by running the following in the terminal:

     ln -s ~/INSERT/PATH/TO/REPO/HERE/git-gui.desktop ~/.local/share/applications

     • For this to come into effect, logging out and logging back in may be required.