Open Source Linux Git Software

You list files hundreds of times a day. Why spend your time squinting at black and white text? exa is an improved file lister with more features and better defaults. It uses colours to distinguish file types and metadata. It knows about symlinks, extended attributes, and Git. And it’s small, fast, and just one single binary. Different types of file and data will be coloured differently, and the user and group columns will be highlighted for the current user. exa can display a file’s extended attributes, as well as standard filesystem information such as the inode, the number of blocks, and a file’s various dates and times. exa queries files in parallel, giving you performance on par with ls. Not only is the standard tree tool built-in, but it’ll show you your files’ information alongside the hierarchy. View the staged and unstaged status of every file, right there in the standard view. Also works in tree view for a high-level overview of your repository.

Perform a merge between two branches incrementally. If conflicts are encountered, figure out exactly which pairs of commits conflict, and present the user with one pairwise conflict at a time for resolution. Reduce the pain of resolving merge conflicts to its unavoidable minimum, by finding and presenting the smallest possible conflicts: those between the changes introduced by one commit from each branch. Allow a merge to be saved, tested, interrupted, published, and collaborated on while it is in progress. Multiple incremental merges can be in progress at the same time. Each incremental merge has a name, and its progress is recorded in the Git repository as references under refs/imerge/NAME. The current state of an incremental merge can be visualized using the diagram command. An incremental merge can be interrupted and resumed arbitrarily, or even pushed to a server to allow somebody else to work on it.