Linux Binary Diff Gui
DHEX is a more than just another hex editor: It includes a diff mode, which can be used to easily and conveniently compare two binary files. Since it is based on ncurses and is themeable, it can run on any number of systems and scenarios. With its utilization of search logs, it is possible to track changes in different iterations of files easily.
Git Introduction:Git is a software source code 'Change Management' (CM) system for collaborative development. Git Commands:Git command summary cheat sheet:CommandDescriptionMan Pagegit -helpList Git commandsgit -help commandHelp on given ' command'git add path/filenamegit add file1 file2 file3 git add -update git add -allAdd a file or directory to Git CM control. This does not commit the files to the repository but merely adds files to 'staging' status.Must also perform: git commit to enter changes in the repository.View staged files: git ls-files -stage Empty directories are not added. Git manages files only.-update: stage all tracked and modified files.Undo an add: git reset HEAD path/filenamegit blame filenameShow file line numbers annotated with author information. Also see git loggit branch -aList all branches (remote and local)git checkout parentPath/filenamegit checkout master git checkout e3b43d63Undo local changes. Revert changes. This directive is misleading as it implies a client-server action.
Instead, it relies on the local repo and sets the working copy to the unchanged version, reverting changes.Checkout 'master' will set the local work area to match the master branch. You can also specify the commit to which you want the local repo to view.Also see git resetgit clean -df git clean -df git -n clean git -dn cleanRemove files not managed by Git.-df: All unchecked files and directories are removed.-n: Dry run. Command not executed.-d: directoriesClean has nothing to do with an Ant target of 'clean' and is in no way related.
Also see git gcgit clone clone ssh://user@git.megacorp.com:/srv/git/repo/projectx.gitCopy/clone/create a local repository from the remote repository specified.Potential Pitfall: The following error often is a connectivity issue:fatal: not valid: is this a git repository? If a proxy error is keeping you from connecting. Fix: unset httpproxygit commitgit commit dir-path/filenamegit commit -m 'Message goes here.'
FilenameCheck-in (commit) local staged 'working' files into local repository. Files must be staged for commit using git addFiles are recursively located and committed into the local git repository. Git commits are Atomic, i.e. All files are committed or none are committed, no incomplete check-in.git config -global user.name 'John Doe'git config -global user.email jdoe@megacorp.comgit config -l git config -global -unset user.passwordThis configures /.gitconfigShow your local GIT configuration for your local repoClear cached password. Will be prompted on next push/pull. Ignore files with.gitignore:There are many files and directories one would like git to ignore and never check-in to the repository.
When programming C/C one may never want to check-in object (.o) files.Java programmers may never want to check-in '.class' files.IDE's like Netbeans will generate personal configuration settings that one would not want to check-in as they would always conflict with other developers.Git can be configured to ignore these files by generating the file.gitignore in the top directory of your repository.Example src/projectx.git/.gitignore.a.o.so.dll.liba.out.jar.classAdd the following for Netbeans developers:private././nbproject/private/. GIT Tags:CM systems such as RCS, CVS and Subversion have all supported tag substitutions and so can Git.Keywords are substituted and will not appear in the file until a new revision of the file is updated from the repository.The following RCS attribute tags can be set on files stored in GIT.
Graphical diffs and merges for Linux:Three types of file differences are covered in this section:. Show file differences made since a pull or checkout was made. This shows the changes you have made. It is useful to perform this before a commit. Show file differences between two files versions stored in Git. Show differences / conflicts, choose and merge.Note that the following conventions are used:.
LOCAL: file on your current local branch. REMOTE: branch you are merging to (e.g. Newbranch you are trying to pull.
Their changes.). MERGED: the partially merged file with merge conflicts marked with chevrons:. 7c10716976ee3e9d49f69d71ec6cc4bd43957ec8: conflicted lines between this and ' are their changes in the repository which conflict.You have the option of using a merge tool or just editing the file to reflect the changes you want. The chevrons and ' must be removed. BASE: the original common ancestor file from which LOCAL and REMOTE evolved. The file before the conflicted changes. 1) File differences since last pull:Git uses the command line Linux ' ' command.A GUI diff tool is far more intuitive and can be specified using the following commands:.
Configure git to use a GUI diff tool:. git config -global diff.tool meld. git config -global difftool.meld.cmd 'meld $LOCAL $REMOTE'This adds the following entry to your /.gitconfigdifftool = melddifftool 'meld'cmd = meld $LOCAL $REMOTE. GUI diff between file in working area and repo: filename.javaViewing (1/1): 'filename.java'Launch 'meld' Y/n: y. 3) Conflicts and merges:Configure git to use a GUI merge tool.
Note that most diff tools also support merges:. git config -global merge.tool meld.
git config -global mergetool.meld.cmd 'meld $LOCAL $MERGED $REMOTE'This adds the following entry to your /.gitconfigmergetool = meldmergetool 'meld'cmd = meld $BASE $LOCAL $REMOTE -output $MERGEDMerge conflicts occur when two developers check out common files and both edit the same line/lines. Edits to different lines merge automatically and cleanly.When changes are made to the same line and then one developer commits and pushes the code, the second developer must deal with the merge conflicts by selecting the line they want, 'ours' or 'theirs'.GUI merge tools support the management of a merge by addressing the lines marked as a conflict using the text markers ' '. List of graphical diff and merge tools:.:. gtkdiff: Has diff3 and merge features.
Written with GTK+. After gtkdiff-0.8.0, GNOME desktop required.: Diff/merge GUI tool. Good line matching features. Supports Unicode.: Graphical directory and file diff, merge and edit. KDE3/Qt based.
(Cross platform) MS/Windows download available. A very good directory and file diff and merge tool. Diff:. git config -global diff.tool kdiff3. git config -global difftool.kdiff3.cmd 'kdiff3 $LOCAL $REMOTE' This adds the following entry to your /.gitconfigdifftool = kdiff3difftool 'kdiff3'cmd = kdiff3 $LOCAL $REMOTE.
Merge:. git config -global merge.tool kdiff3. git config -global mergetool.kdiff3.cmd 'kdiff3 $BASE $LOCAL $REMOTE -o $MERGED' This adds the following entry to your /.gitconfigmergetool = kdiff3mergetool 'kdiff3'cmd = kdiff3 $LOCAL $BASE $REMOTE -o $MERGED.: Ships with (RHEL6/RHEL5/RHEL4/FC3+) KDE SDK. Included in Red Hat RPM package 'kdesdk' an Ubuntu package 'kompare'.Potential Pitfall: RPM installation error:error: Failed dependencies:perl(DCOP) is needed by kdesdk-3.5.4-3.el5.i386Solution: Install the dependency package 'kdebindings'. mgdiff: Motif-based graphical file difference browser and merge.Comes with S.u.S.E. Distro.: Compare, edit and merge.
Diff:. git config -global diff.tool meld.
git config -global difftool.meld.cmd 'meld $LOCAL $REMOTE' This adds the following entry to your /.gitconfigdifftool = melddifftool 'meld'cmd = meld $LOCAL $REMOTE. Merge:. git config -global merge.tool meld. git config -global mergetool.meld.cmd 'meld $BASE $LOCAL $REMOTE -output $MERGED' This adds the following entry to your /.gitconfigmergetool = meldmergetool 'meld'cmd = meld $LOCAL $BASE $REMOTE -output $MERGED.: Compare 2 or 3 files and merge. Also compares directories. commercial tool (cross platform). GIT GUI interfaces for Linux:Git comes with a GUI: git gui and a browser tool gitk The latest version is available fromInstallation:.
Ubuntu: sudo apt-get install git-gui. From source:. wget chmod +x gitkFor other options see:.: cross platform, push/pull, history, diffs, revert, stash, etc.
Intuitive and customizable.: cross platform commercial product.: View revisions, diffs, files history, files annotation, archive tree, Commit changes visually cherry picking modified files.: commercial product. Free for non-commercial use. Cross platform.: Python git front-end. (cross platform).: GTK+ application.Web Clients:.: comes with Git.: Ruby, community edition.: written in Go.: a fork of Gogs.: community edition and commercial product. User control, permissions, code reviews, and tool integration.: Symfony PHP framework. Connects to repositories via ssh.:.:.: community editionPlug-ins:.: GNOME Nautilus/Nemo file browser GIT plug-in.
Eclipse IDE plug-inNote: A GIT client is built into many of today's development IDEs such as NetBeans. Git Best Practices:. ALWAYS compile and test before pushing source code to the origin server. Developers expect shared changes to compile.
Binary Diff Tool
Always add commit comments. Nothing is more obnoxious that looking at an uninformative log or information history. Monstrous binary files like CD or DVD ISO images are better suited for storage on a file system rather than in Git. Git will not be able to show differences between version and will be slower than a raw filesystem. Don't copy, rename and move directories and files with system shell commands. Use Git commands to 'rm', 'mv', and 'add' files and then commit changes when done. Work within Git.
Linux Binary Diff Guide
Push changes as a single logical change-set for one purpose. Thus all code changes for a single bug fix or enhancement should be checked-in together.This allows one to better follow the history log of changes. Stage code at the directory level and all changed files, recursively in the directory and sub-directories will be checked in together.git add -all. Stage files together by specifying them explicitly:git add file.cpp file2.cpp. Tie Bug tracking and Git CM together:. Use comments when commiting files into Git.
Add bug tracking numbers to the comments so Git will reference Trac bugs. If using Trac, add Trac comments so that links are generated to the Git repository by placing the Git revision hash in square braces (i.e. e3b43d63) in a Trac comment. In this way, Trac will have a direct URL link to Gitweb. If using Trac integrated with Git, refer to the Trac ticket in the Git commit comment using a '#' in front of the Trac ticket number (e.g. #65) This generates a hyperlink when the Git logs are viewed in Trac. Documentation and related artifacts checked-in to Git should not be under the source tree but parallel to it.This isolates the source tree so that email notification triggers sent to developers upon source changes will only go out on source changes or regression build and test systems like or will only rebuild and test on source changes rather than on unrelated documentation changes.