04-27-2004
You need a packet sniffer, or with a more graceful name, protocol analyzer. A powerful protocol analyzer on Unix (with X-Windows) is ethereal.
(
http://www.ethereal.com/)
You'll enjoy it because it's very easy to use, and you can save all the packets recorded into file for reexamination later. For common protocols, it even parses the packets and give you details of each field.
10 More Discussions You Might Find Interesting
1. UNIX for Dummies Questions & Answers
Ok, i know I'm missing something here. On my laptop I run red hat 8 and the KDE network configuration tool is brought up by the command "neat". I've just taken in another computer which i am intending to use for a media box among other things. I installed Caldera OpenLinux 3.1.1 on it and cant seem... (3 Replies)
Discussion started by: djtrippin
3 Replies
2. Solaris
Hi all,
I just bought a new system, but am unable to configure network on it..
am using a nge0 ethernet interface to login.
i've tried all i knew but not of the webpages seem to open.
Here is what i've done..
ifconfig nge0 plumb
ifconfig -a
(nge0) was being displayed as up and running.
... (23 Replies)
Discussion started by: wrapster
23 Replies
3. UNIX for Dummies Questions & Answers
How to add characters (not on the keyboard) with vi to a file?
Example:
How can I enter the copyright sign (UTF-8-Codetable: 169) with vi? (3 Replies)
Discussion started by: desertchannel
3 Replies
4. Solaris
Hi All,
I was wondering if there is any Network Monitoring Tool for Solaris 10 to monitor a network having hybrid operating systems. I just googled it without success.
Hope, experts will guide me to get it.
Thanks,
Deepak (0 Replies)
Discussion started by: naw_deepak
0 Replies
5. Infrastructure Monitoring
Hi All,
I was wondering if there is any Network Monitoring Tool for Solaris 10 to monitor a network having hybrid operating systems. I just googled it without success.
Hope, experts will guide me to get it.
Thanks,
Deepak (7 Replies)
Discussion started by: naw_deepak
7 Replies
6. Red Hat
Hello,
Please let me know the best and descriptive network monitoring tools available for a linux enviornment. (3 Replies)
Discussion started by: mitchnelson
3 Replies
7. UNIX for Dummies Questions & Answers
Hello,
is there any tool where I can scan my netwrk and get all types of Unix servers? (2 Replies)
Discussion started by: fsmadi
2 Replies
8. IP Networking
I have one computer with internet connection and printers that I would like to connect to another computer to use as a practice/test Server. I would like the server to access the other computer by a direct connection of some sort because I don't see the point of aquiring the hardward (ethernet... (5 Replies)
Discussion started by: theKbStockpiler
5 Replies
9. OS X (Apple)
My UNIX skills amount to "Google,Copy,Paste..." but I managed to get a useful log file generated by an automation system that runs 24/7. The log file exists on an Omneon Media Grid server where I monitor it via "tail -F /..." Unfortunately we have many workstations running Tiger 10.4.8 still and... (2 Replies)
Discussion started by: SolarDarkroom
2 Replies
10. News, Links, Events and Announcements
Participate in a research study being conducted by netCHI lab at the University of Maryland's iSchool. We are interested in improving the software updating experience for users. In particular, we would like to know how network administrators and application developers manage, develop, and deploy... (0 Replies)
Discussion started by: jme4yg
0 Replies
LEARN ABOUT LINUX
git-mergetool
GIT-MERGETOOL(1) Git Manual GIT-MERGETOOL(1)
NAME
git-mergetool - Run merge conflict resolution tools to resolve merge conflicts
SYNOPSIS
git mergetool [--tool=<tool>] [-y | --[no-]prompt] [<file>...]
DESCRIPTION
Use git mergetool to run one of several merge utilities to resolve merge conflicts. It is typically run after git merge.
If one or more <file> parameters are given, the merge tool program will be run to resolve differences on each file (skipping those without
conflicts). Specifying a directory will include all unresolved files in that path. If no <file> names are specified, git mergetool will run
the merge tool program on every file with merge conflicts.
OPTIONS
-t <tool>, --tool=<tool>
Use the merge resolution program specified by <tool>. Valid values include emerge, gvimdiff, kdiff3, meld, vimdiff, and tortoisemerge.
Run git mergetool --tool-help for the list of valid <tool> settings.
If a merge resolution program is not specified, git mergetool will use the configuration variable merge.tool. If the configuration
variable merge.tool is not set, git mergetool will pick a suitable default.
You can explicitly provide a full path to the tool by setting the configuration variable mergetool.<tool>.path. For example, you can
configure the absolute path to kdiff3 by setting mergetool.kdiff3.path. Otherwise, git mergetool assumes the tool is available in PATH.
Instead of running one of the known merge tool programs, git mergetool can be customized to run an alternative program by specifying
the command line to invoke in a configuration variable mergetool.<tool>.cmd.
When git mergetool is invoked with this tool (either through the -t or --tool option or the merge.tool configuration variable) the
configured command line will be invoked with $BASE set to the name of a temporary file containing the common base for the merge, if
available; $LOCAL set to the name of a temporary file containing the contents of the file on the current branch; $REMOTE set to the
name of a temporary file containing the contents of the file to be merged, and $MERGED set to the name of the file to which the merge
tool should write the result of the merge resolution.
If the custom merge tool correctly indicates the success of a merge resolution with its exit code, then the configuration variable
mergetool.<tool>.trustExitCode can be set to true. Otherwise, git mergetool will prompt the user to indicate the success of the
resolution after the custom tool has exited.
--tool-help
Print a list of merge tools that may be used with --tool.
-y, --no-prompt
Don't prompt before each invocation of the merge resolution program.
--prompt
Prompt before each invocation of the merge resolution program. This is the default behaviour; the option is provided to override any
configuration settings.
TEMPORARY FILES
git mergetool creates *.orig backup files while resolving merges. These are safe to remove once a file has been merged and its git
mergetool session has completed.
Setting the mergetool.keepBackup configuration variable to false causes git mergetool to automatically remove the backup as files are
successfully merged.
GIT
Part of the git(1) suite
Git 1.8.5.3 01/14/2014 GIT-MERGETOOL(1)