8 More Discussions You Might Find Interesting
1. AIX
Hopefully this is the correct place to post this, if not please let me know.
I am trying to find a way to print from AIX directly to a windows PDF printer. I don't really care if it is paid or freeware, I am just trying to get it to work. I did see a product called BullZip and I am going to... (3 Replies)
Discussion started by: DerangedNick
3 Replies
2. Solaris
Guys, I have a issue that I am trying to rectify please advise.
lpstat -t shows
scheduler is running
printer lext644 disabled since Mon Dec 02 19:48:18 2013. available.I have restarted the printer service and it shows online but the above says disabled. I have a lot of jobs in the print... (1 Reply)
Discussion started by: terrywhitejr
1 Replies
3. Programming
Sorry, I meant to type "porting C codes from Solaris 10, x86 to cygwin in Windows"
I just installed cygwin 1.7 to my Windows PC.
I have a C program that compiles fine using gcc on Solaris 10, x86. This C program contains system calls like:
system ("ls -l > file.txt");
and
system... (3 Replies)
Discussion started by: serendipity1276
3 Replies
4. SCO
i have application of gestion instaleled in sco openserver but i want to config my printing in my windows xp
name of my print is epson lq 2080
and it's instaled in windows xp
thank all ;);):):b::b::b:
i accede to my server sco open whith logiciel putty (2 Replies)
Discussion started by: skambram
2 Replies
5. UNIX for Dummies Questions & Answers
I have successfully gotten AIX to print to a windows shared printer with this command:
smbclient -U user%password -W domain -c "print file.ext"
the only problem is: I have this print queue set up on the Windows side to overlay an image to all pages. When printing from samba, the overlay... (2 Replies)
Discussion started by: raidzero
2 Replies
6. HP-UX
Hello
I've been google'ing to try to find an answer to my question but can't seem to find it.
What I want to do is to pass the email address of a user printing from the HP-UX to a printer attached to a Windows 2003. The printing is done using lp.
I can see that the printjob on windows has... (0 Replies)
Discussion started by: jacma
0 Replies
7. UNIX for Advanced & Expert Users
I have a printer on sun solaris configured on a terminal server I want to print on this printer from windows xp or windows 2003 I put the devices that want to print in the hosts and hosts.lpd file
and the I use the comman lpr -S my_server -P unix_printer my_file
but the job didn't go . can I... (1 Reply)
Discussion started by: maher2000@hotma
1 Replies
8. UNIX for Advanced & Expert Users
Hi, I have done this year ago, and now I need to do it again, but did not remember how I do it. I have a slip printer on a windows xp workstation and i need to print from SCO unix application to that printer. I try to create a remote printer but the only option available is unix, the other to... (0 Replies)
Discussion started by: comsiconsa
0 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.5.3 01/14/2014 GIT-MERGETOOL(1)
