I am interested in knowing if anyone out there has been using the BSD UNIX that underlies
MacOS X. Is this an "industrial strength" version of UNIX? Can I run X-Windows on such
a machine? How about TeXing, pythoning, PERLing or using other useful UNIX goodies
near and dear to my shrunken... (1 Reply)
When I checked with top command, I found tht my buffers are always 137M, which means that they are sort of overloaded. My Inactive memory is 520M. Is it possible to increaase the buffer size and what would be the command for that? (0 Replies)
The "top" command shows that my buffer size is always at 137M, which I think has reached to the maximum. However, Ido have lots of Inative memory? Is it possible to increae the buffer size? and what is the command for that? Further, this is the buffer for writing to the hard disk? (3 Replies)
HI! All
Iam facing an issue with split comman in unix
Prifix=Z_PRICE_NEW`date "+%Y%m%d%H%M%S"`
split -5000 Product.txt $Prifix
find . -name "$Prifix*" -print | {
while read FILE;
do
mv $FILE $FILE.txt
done
}
when is execute the comman the command is working fine and generating the... (2 Replies)
Hi
have IBM aix. unix
my directories are full
when i use
$ df -k
filesystem kbytes used avail capacity mounted on
/dev/root 288880 288880 288880 100% /
/proc 0 0 0 ... (4 Replies)
I'm trying to get a MacBook Air (MBA) running 10.6.5 to recognize a Samsung Galaxy S (Android 2.2) vis the USB interface for simple file transfers back and forth. Nothing works so far. I've tried many things! :wall:
I noticed when I connect my phone to the MBA, there is a message in system.log... (2 Replies)
I have a file File1 containing lines like below
apple ${FRUIT}-Color
orange ${FRUIT}-Color
banana ${FRUIT}-Color
Now, in my shell I'm reading the file like below
while read FRUIT DESC; do echo $FRUIT $DESC; done < File1
which outputs -
apple ${FRUIT}-Color
orange ${FRUIT}-Color... (3 Replies)
why,just beacuse that its the bottom layer uses a small amount of bsd code? In my opinion, macos and Unix are completely different. The directories are long directory structures. For example, /application, /system, /user, /volumes, etc. are completely different from the traditional /bin/ /sbin... (5 Replies)
Discussion started by: malaizhichun
5 Replies
LEARN ABOUT SUSE
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|--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. 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 merge tools are: kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff,
ecmerge, diffuse, tortoisemerge, opendiff, p4merge and araxis.
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.
-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.
AUTHOR
Written by Theodore Y Ts'o <tytso@mit.edu[1]>
DOCUMENTATION
Documentation by Theodore Y Ts'o.
GIT
Part of the git(1) suite
NOTES
1. tytso@mit.edu
mailto:tytso@mit.edu
Git 1.7.1 07/05/2010 GIT-MERGETOOL(1)