Scripts for git, enabling some of my common workflows.

Enables git conflicts; check the conflicts that will occur when merging two specified branches.

Uses git_conflict_parser.py under the hood.

Enables git mergedit; does a merge and then opens all files with conflicts in $EDITOR.

Uses git_merge_parser.py under the hood.

Enables git recent show recent branches with timestamps.

Enables git recentch; get recent branches sorted by local checkout time.

Enables git recentco; get recent branches by last commit time.

Tools for switching to recent branches. popb for last branch, switchb for an interactive menu.

Search the log on the current branch for commits by a specific author.

Tool to interactively delete branches.

Enables git jnb; auto-format a new branch name based on a short text description and switch to it; base is current HEAD.

Enables git diffago; compare working tree with commit N commits ago (from HEAD). Eg git diffago 3 = git diff HEAD~3 and git diffago 3 HEAD = git diffago HEAD~3 HEAD.

Enables showing files using the tree command; requires tree to be installed.