03-27-2010
Double post, continued
here, thread closed.
Also, completely wrong forum.
10 More Discussions You Might Find Interesting
1. UNIX for Dummies Questions & Answers
Hi,
i have a request about rcp.
is it possible to to make a rcp sessions for a normal user witch should have this option without a password prompt.
what are the important steps ....
add the host and user i the .rhosts
and
and
.
.
.
.
many thx (1 Reply)
Discussion started by: scottl
1 Replies
2. IP Networking
Hi
I am using a Solaris 2.5.1 and i am unable to logon on the console.
When i key in say, root on the login prompt, it does not prompt me for password but instead return to the login prompt again.
Please help.
thanks (2 Replies)
Discussion started by: owls
2 Replies
3. Shell Programming and Scripting
Hi,
First i want to tell you i am not a administrator and everytime to run a sqlscritpt i have to login as SU in a particular account to connect to sqlplus..
I want to write a script which can make me free by doin this .. since i am having the permission for SU i want to know if i can SUDO... (7 Replies)
Discussion started by: myelvis
7 Replies
4. UNIX for Advanced & Expert Users
hi
I have installed a new Linux machine and having another machine having Solaris on it. i want that when i log into my solaris machine using rlogin from Linux machine then no password prompt occurs...
Thanks in advance. (4 Replies)
Discussion started by: rochitsharma
4 Replies
5. OS X (Apple)
Hey there, I'm trying to do a very simple rsync to back up my computer to an external drive connected via usb every night, but it keeps asking for a password. I tried using the password file flag, but it looks like that is only a daemon. Does anyone have any ideas? This has eaten up a lot of my... (4 Replies)
Discussion started by: aarond
4 Replies
6. UNIX for Advanced & Expert Users
Is there any way I can change the prompt which asks for the password on a UNIX system? e.g. When I login using Telnet instead of "Password" I should get "Correct Password".
Thanks,
Vineet (3 Replies)
Discussion started by: vineetd
3 Replies
7. Red Hat
Hello,
I installed Kerberos on Red Hat. My testing tool checks for the prompt when user log-in. Unfortunately I don't have access to that testing tool so I have to fix somehow the prompt.
My testing tool expects this format:
login: XYZ
Password:
When I installed Kerberos I have this format:... (1 Reply)
Discussion started by: susja
1 Replies
8. Solaris
Hi All,
I have created a new user. Using the below command I have created the user successfully.
useradd -c "Test user" -d /tmp/test -g Testgroup -s /bin/ksh -u 601 Test
I don't want to set the password using “passwd” command after creating a user.
I want to prompt for the new... (2 Replies)
Discussion started by: kalpeer
2 Replies
9. UNIX for Dummies Questions & Answers
hi,
i have a requirement where i need to sudo to another user in the shell script.suppose consider user A and B, first user A calls a shell script and then i need to sudo to user B which executes another shell script inside the earlier one.
also this needs to be automated like while sudo'ing to... (3 Replies)
Discussion started by: krk
3 Replies
10. Shell Programming and Scripting
Hi All,
I am currently writing script to get the details for lot of hosts from jump server. Means each and every time it will ssh to the host and get the information. To achieve that I need to automatically accept the password from Jump server to that main hosts. We are using kerberos password... (6 Replies)
Discussion started by: kamauv234
6 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)