9 Best Linux File Diff or Comparison Tools This description was born out of a reference to the output of diff, the well known Unix command-line file comparison utility. When you compare two computer files on Linux, the difference between their contents is called a diff. I have written about it earlier.While writing program files or normal text files, programmers and writers sometimes want to know the difference between two files or two versions of the same file. KDiff3: The king of its kind on Linux though not very easy to use till you get used to it. The toolbar icons seemed a little big and it would have been better if the current difference could be highlighted with a different colour to make that more readable. SourceGear DiffMerge: I found it a little less flexible as it allows you to modify only the file in the RHS in 2-way merge. This should be your choice if you are intimidated by KDiff3. All of these support 3-way file compare.ĭiffuse: Fast and cool GUI. Here are a few such file compare tools which are very lightweight and do the job very well. Cmdline utilities like vimdiff are OK but I was looking for something in GUI so that the learning curve is easier. When I switched completely to Linux I had to find an alternative. There was a time I used WinMerge regularly on Windows for comparing files. To install tig on Ubuntu: $ sudo apt-get install tig Posted on 25 Feb, 2014 1 Feb, 2016 Author Mailman Categories PROGRAMMING Tags file compare diff merge linux, git, scm, version control 4 Comments on QGit & Diffuse: Git GUI on Linux Compare files on Linux To browse a git repository navigate inside a versioned directory and run tig. It functions mainly as a Git repository browser, but can also assist in staging changes for commit at chunk level and act as a pager for output from various Git commands. Tig is an ncurses-based text-mode interface for git. To install QGit and Diffuse on Ubuntu, run: $ sudo apt-get install qgit diffuse Retrieve revisions of files from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, SVN and SVK repositories for comparison and merging.Modify both left and right side files (2-way merge).Manually adjust line matching and directly edit files.Merge N number of files side by side in different panes.However, one of its most powerful features is the support for version control systems. Diffuse is one of the few diff-merge tools that supports N-ary file merge. QGit integrates seamlessly with Diffuse, a graphical file diff viewer. Available by default in the repositories for major distros.Commit, amend commit, make branch, make tag.User defined keyboard shortcut for Actions.Save a patch series to send for review, apply a patch at any revision, view a patch.File tree view that helps to track commits to a single file.Can launch an external diff viewer like Diffuse.Shows everything you need to understand a change: commit history (including range), change log for individual commit, diff, modified file list. I found QGit to be exactly the tool I needed. There are many Git GUI interfaces on Linux but some of them are bulky and some lack finesse. To speak the truth, the terminal is not really the best option to look at a overwhelming number of change records which need to be examined in detail and in reasonable time. I was looking for a good GUI based Git repository browser to view changes.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |