Ubuntu – graphical git commit application to show diffs and set a commit message

gitsoftware-recommendation

As part of my work I regularly commit to git. I have a fabric script that does an interactive commit: git commit -a which shows me which files have changed in nano and then lets me write a commit message.

The problem with this flow is sometimes I need to know what changes I've made inside a file. I was doing a ton of stuff at 3am this morning and I can't for the life of me remember what I was doing. I have to manually git diff to see the changes.

Is there a graphical application that can help me out here? It still needs to be scripted from fabric but in a perfect world it would be a textbox, a list of changed files and a meld-like window showing diffs based on the file I selected. Does such a glorious thing exist?

Best Answer

I normally just use git gui. It shows the list staged and unstaged changed files, and shows their diffs, and lets you selectively stage hunks, add a log message, and commit. Even has a nice knob to amend the last commit instead.

Related Solutions

Ubuntu – git indicator to get notification on commit, pull

I wrote a little python program that does what you're looking for. It's a bit rough around the edges, so I'd appreciate any feedback you might have.

ubuntu git indicator

To use it, run git-indicator from a directory that contains one or more git repositories (like you'd use git-dude).

Example:

~$ git clone https://github.com/itsadok/git-indicator.git ~/.git-indicator
~$ cd ~/repos
~/repos$ ls
repo1 repo2 repo3
~/repos$ ~/.git-indicator/git-indicator.py &

Ubuntu – Get binary delta-encoded recursive diff of two directories as single patch file in CLI (and online use)

I would go for a low key solution. If I get you correctly, you want to update web pages and don't expect most of them changing, in which case I would just upload the changed files, whole.

This could be achieved eg. in mc, connect one panel over FTP to your web host, let other panel show the local version. Then select everything and copy, and choose to overwrite only all newer files (you can chose that for all files at once). Or use another file manager's synchronize facility, I believe krusader has some. Unless you've got big files which change only locally (what are they? databases¹? executables maybe, but not compressed?), binary deltas won't give you much IMO.

NOTE 1: Synchronizing databases in this way is a bad idea.

Best Answer

Related Solutions

Ubuntu – git indicator to get notification on commit, pull

Ubuntu – Get binary delta-encoded recursive diff of two directories as single patch file in CLI (and online use)

Related Question