04-26-2012
Amazing.. truly mind blowing suggestion!! thanks a ton
neutronscott , worked like a charm
10 More Discussions You Might Find Interesting
1. UNIX for Dummies Questions & Answers
I am having a hard time figuring out how to change the command prompt in my UNIX shell.
I am using the bash shell, and I would like to set the prompt to show me the full path of the current working directory along with my username, I suppose... The main thing I want is the full path of the... (2 Replies)
Discussion started by: WERUreo
2 Replies
2. UNIX for Dummies Questions & Answers
Hello there !
I am new in this Unix world and just start learning Unix. I have very simple question about changing PS1 variable (Shell Prompt)
i have local.profile file in my working directory, i open in vi edit mode and add this line PS1="Hello:>" and i save that file.
I disconnected from... (2 Replies)
Discussion started by: abidmalik
2 Replies
3. Shell Programming and Scripting
Hi,
I want to change my command prompt to contain the current username and the current directory in it, instead of just the '$' symbol.
I tried the command:-
export PS1="$(echo \\n$) "
But whenever I switch the user or change the directory, the changes are not reflected in the command... (10 Replies)
Discussion started by: unipepper
10 Replies
4. UNIX for Dummies Questions & Answers
would someone please explain in detail, how does the code below change the color or bash prompt
$ echo $PS1
:\033
are there other tricks like above? (3 Replies)
Discussion started by: rakeshou
3 Replies
5. UNIX for Dummies Questions & Answers
please advise what's wrong with this command ?
PS1="`hostname`:`who am i | cut -d " " -f1`:>>"
trying to make the PS1 prompt look like :
machine_name:username:>>
thank you (4 Replies)
Discussion started by: venhart
4 Replies
6. Shell Programming and Scripting
Hi,
I'm trying to find out if there is a way to get a timestamp on my Solaris root shell prompt using /sbin/sh?
I'm trying to archive something in line with the following:
12:34:26 root@server #
12:34:28 root@server #
12:34:28 root@server # ls
...
12:34:30 root@server #
I know there... (1 Reply)
Discussion started by: Solarius
1 Replies
7. UNIX for Dummies Questions & Answers
Dear Members,
I have an variable by name dir.If i do echo $dir i will get the path (/usr/bin/).
I am writing a shell script which will prompt to enter the variable name if run.Suppose the script name is test.sh.
If run test.sh it will prompt for entering variable name which is dir.Suppose... (9 Replies)
Discussion started by: sandeep_1105
9 Replies
8. UNIX for Dummies Questions & Answers
So, this is strange... I created this prompt:
PS1='\n\e
You can see that it's a pretty minor modification of the default Debian prompt. And, if it matters, I'm using Putty to SSH to my server. The following strange symptoms appear when I use that prompt, and disappear when I change and... (2 Replies)
Discussion started by: treesloth
2 Replies
9. UNIX for Dummies Questions & Answers
I have given as:
PS1="Karthick>" in linux.
Now the prompt changed as:
Karthick>
Now I need to get back the default prompt .
How to achieve this?
Thanks in advance (13 Replies)
Discussion started by: karthick nath
13 Replies
10. Solaris
Hi, I need help changing PS1 in Solaris. I tried this:
MYPROMPT="> "
PS1=$LOGNAME@$HOSTNAME:${PWD}$MYPROMPT (NOT SURE WHY IT'S HIGHLIGHTED HERE)
export PS1
My problem is that $PWD is not working, when I get the prompt and I change directories, the prompt is not displaying the current... (17 Replies)
Discussion started by: curiousmal
17 Replies
LEARN ABOUT OSX
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. This is the default if the merge resolution program is explicitly
specified with the --tool option or with the merge.tool configuration variable.
--prompt
Prompt before each invocation of the merge resolution program to give the user a chance to skip the path.
-O<orderfile>
Process files in the order specified in the <orderfile>, which has one shell glob pattern per line. This overrides the diff.orderFile
configuration variable (see git-config(1)). To cancel diff.orderFile, use -O/dev/null.
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 2.17.1 10/05/2018 GIT-MERGETOOL(1)