10 More Discussions You Might Find Interesting
1. Shell Programming and Scripting
Greetings all,
I have came up with some code, to read an input file and generate a list, here is a sample of what I am working with. The variable $USER will be inputted by the person running the utility.
do
folder=${line%}
echo "$folder $USER
done < list.txt
sample of list.txt-
... (15 Replies)
Discussion started by: jeffs42885
15 Replies
2. Shell Programming and Scripting
so i have a script that runs across many servers. i'd like to know how many times this script is being used on each server.
the only straight forward, non-intrusive way i can think of doing this is to include a line in the script to make a webcall to a central server. and from that central... (9 Replies)
Discussion started by: SkySmart
9 Replies
3. Shell Programming and Scripting
Hello ,
On a couple of system I have to check that systems have the same configuration. This system are part of manual cluster but when application are going to switch from one side to another side I would like to be sure I am not going to experience incidents. It is why I wonder if on the web... (2 Replies)
Discussion started by: xavier38450
2 Replies
4. UNIX for Advanced & Expert Users
Hi everyone,
I would like to ask if it is possible to gather SAR data on a specified time. let say yesterdays report, i want to get data at around 12PM and 5PM.
thank you. (2 Replies)
Discussion started by: cwiggler
2 Replies
5. UNIX for Dummies Questions & Answers
Hi there,
I am hoping someone can help!
I am doing a simple difference between two files using the sdiff command..
sdiff -s file1 file2
this works, but for some words it doesn't...
Here is an example:
fha 2B01 fha 2B01
fmaa 3A01 fmaa 3A01
fox 4A46 | fmx 3A01
... (1 Reply)
Discussion started by: thegant
1 Replies
6. Shell Programming and Scripting
I am pretty new at shell scripting, but I managed to make a primative shell script to connect from my webserver (bluehost) to an external data server via ftp or sftp or whatever I need. This script is :
#!/bin/sh
HOST='ftp.host.com'
USER='username'
PASSWD='password'
FILE='file'
ftp -n... (7 Replies)
Discussion started by: mesoeast
7 Replies
7. UNIX for Dummies Questions & Answers
Hi all, :confused:
I want to know about the configuration management tool that is used in SCO UNIXWARE 7.1.3. Please refer some sites where i could get the details.
Thanks in advance
kavitha (2 Replies)
Discussion started by: kavithadass
2 Replies
8. UNIX for Dummies Questions & Answers
Hi there, I have been asked to write a script that gathers enough information on our Sun Solaris machines to be able to rebuild and configure them if they should go pop.
My question is does anybody have any suggestions on the files that I need to take a copy of, to ensure that everything is... (4 Replies)
Discussion started by: hcclnoodles
4 Replies
9. Shell Programming and Scripting
Hi all again,
here is the file i am working on :
GREIMBAJ00;BAN_CAV;Loader.sh;2003/06/13;17:04:04
GREIMBAJ00;BAN_CAV;Loader.sh;2003/06/13;17:04:06
GREIMBAJ00;BAN_PAK;Loader.sh;2003/06/13;17:04:11
GREIMBAJ00;BAN_PAK;Loader.sh;2003/06/13;17:04:18... (5 Replies)
Discussion started by: HowardIsHigh
5 Replies
10. 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
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.3.1 06/10/2014 GIT-MERGETOOL(1)