If you are using GNU ls, you could set --color extension to coloring the stuffs.
You can set an alias in your ".profile" or ".bashrc" for ls to ls --color
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)
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)
Hi,
I'm using the ksh shell and I'd like to set my PS1 prompt on an AIX system to include, amongst ther things, the current time.
This was my best effort: export PS1=$(date -u +%R)'${ME}:${PWD}# '
but this only sets the time to the value when PS1 is defined and the time value doesn't... (4 Replies)
It looks like,
user@hostname:/auto/home3/user$
Desired,
user@hostname$
I added following line in .bashrc, but still its same.
export PS1=" $ "
Please help me :confused: (13 Replies)
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)
Greetings!
I have to work with a NFS user id between two hosts: A running Ksh 93 and B running pdksh 88.
My problem has to do with the custom prompt I created on A: it works like a charm and display colors:
PS1="$'\E
But I switch over to B, it all goes to hell (private info... (4 Replies)
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)
RedHat Linux 5.8/Korn Shell
I have text file name /etc/oracle/config.loc. It has the following text
#Device/file getting replaced by device +OCR
ocrconfig_loc=+DATA
ocrmirrorconfig_loc=+OCRBut , when I open this file using cat , the PS1 character (for prompt) appears as the last character... (8 Replies)
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 MOJAVE
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)