From 569178c05f02fa9f22a6fb7bd1baccf3765a866e Mon Sep 17 00:00:00 2001 From: killphi Date: Thu, 19 Dec 2013 14:24:24 +0100 Subject: retab on the rest of the files --- Makefile | 10 +++++----- demo-script | 14 +++++++------- index.txt | 40 ++++++++++++++++++++-------------------- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/Makefile b/Makefile index 27631ce..e355689 100644 --- a/Makefile +++ b/Makefile @@ -12,10 +12,10 @@ COPY_LIST = git-prompt.sh install: - cp -v git-prompt.sh /etc/ - [ -f /etc/git-prompt.conf ] || cp -v git-prompt.conf /etc/ - + cp -v git-prompt.sh /etc/ + [ -f /etc/git-prompt.conf ] || cp -v git-prompt.conf /etc/ + tgit: - xclip -i git-demo - echo "ready to paste ..." + xclip -i git-demo + echo "ready to paste ..." diff --git a/demo-script b/demo-script index 1374a1f..ccd5019 100755 --- a/demo-script +++ b/demo-script @@ -2,7 +2,7 @@ cd p/git-prompt . ./git-prompt.sh cd test -d demo && rm -rf demo/ -test -d ../demo && cd .. && rm -rf demo/ +test -d ../demo && cd .. && rm -rf demo/ clear : ------------------------------------------------------------------------ clear @@ -15,21 +15,21 @@ touch untracked.o echo '*.o' >> .gitignore git commit -q -m "1st line" FOO git checkout -b test -echo "added 2nd line in test" >> FOO -git add FOO +echo "added 2nd line in test" >> FOO +git add FOO echo "2nd in BAR" > BAR git add BAR -echo "added 3nd line FOO" >> FOO +echo "added 3nd line FOO" >> FOO git add FOO git commit -q -m "FOO moded, BAR added" git checkout master -cat FOO -echo "now added 2nd line in master" >> FOO +cat FOO +echo "now added 2nd line in master" >> FOO git add FOO git commit -q -m "2nd line" git merge test git cat-file -p test:FOO > FOO -git add FOO +git add FOO git commit -q -m "merged" cat FOO git checkout HEAD^ diff --git a/index.txt b/index.txt index a48ab80..1ff5ab3 100644 --- a/index.txt +++ b/index.txt @@ -5,7 +5,7 @@ * Repo: httpx://github.com/lvv/scc[GitHub], httpx://bitbucket.org/lvv/scc[BitBucket] + * License: httpx://www.gnu.org/licenses/gpl-3.0.html[GPL3] -:v-p: http://volnitsky.com/project +:v-p: http://volnitsky.com/project :compact-option: compact @@ -20,7 +20,7 @@ terminal bell use `setterm`). == GIT -Branch and files are colored according to state. "M" stands for master. +Branch and files are colored according to state. "M" stands for master. image:screenshot-prompt-git.png[git module screenshot] @@ -33,16 +33,16 @@ image:screenshot-prompt-git.png[git module screenshot] | [darkred]#dark red# | [darkred]#dark red# | Modified and tracked by repo, but modifications not added to index yet. | [lightblue]#light blue# | [lightblue]#light blue# | Untracked file. | [red]#light red# | | Detached Head -| [magenta]#magenta# | | In middle of doing something +| [magenta]#magenta# | | In middle of doing something |================================================================ -== Subversion/SVN +== Subversion/SVN image:screenshot-svn.png[svn module screenshot] SVN module disabled by default because even on moderate sized working directories there is noticeable delay for prompt display. SVN is slower than -GIT. Enable if needed in <> +GIT. Enable if needed in <> == Mercurial/HG HG module was developed by Lee Nussbaum ``. @@ -78,12 +78,12 @@ session. It selects not most frequent dir, but last visited. Matches are done from beginning of of dir name (not path name). ----------------- -cd /tmp +cd /tmp cd "~/long dir mp3" cd "~/long dir mp4" cd /tmp cd /var/tmp -cd /etc +cd /etc cd j t # same as cd /var/tmp j .*3 # same as cd "~/long dir mp3" @@ -97,19 +97,19 @@ Download link:git-prompt.sh[] or get it with GIT: git clone git://github.com/lvv/git-prompt.git --------------- -Put following command at the end of your profile (`~/.bash_profile` or `~/.profile`) +Put following command at the end of your profile (`~/.bash_profile` or `~/.profile`) -------------------- [[ $- == *i* ]] && . /path/to/git-prompt.sh --------------------- -There might be your old prompt defined too. You can comment it out. +There might be your old prompt defined too. You can comment it out. Some distros also have `/etc/bashrc` or `/etc/bash/bashrc` with distro default prompt. -== GIT config +== GIT config GIT-PROMPT requires following GIT's option to be set: @@ -120,17 +120,17 @@ git config [--global] --unset i18n.logoutputencoding ----------------------------- -== GIT-PROMPT config +== GIT-PROMPT config [[config]] -Is optional. If config file is not found then git-prompt uses defaults. +Is optional. If config file is not found then git-prompt uses defaults. Defaults are listed in example `git-prompt.conf`. Git-prompt looks (in listed order) for config file in following locations: * `/etc/git-prompt.conf` * `~/.git-prompt.conf` -Copy example config `git-prompt.conf` +Copy example config `git-prompt.conf` to any of above locations and customize as needed. @@ -143,11 +143,11 @@ to any of above locations and customize as needed. you will maintain `.gitignore` and commit more often. * This prompt is most useful if your screen have enough width. If this is not the case, you might want to disable file list display (`max_file_list_length=0`). -* When prompt is longer than screen-width it wraps to second line. This is always undesirable. - Because of bug in `gnome-terminal` (or `readline` ?) some color escape codes can be visible on second line. +* When prompt is longer than screen-width it wraps to second line. This is always undesirable. + Because of bug in `gnome-terminal` (or `readline` ?) some color escape codes can be visible on second line. I've reported gnome-terminal bug. Again, you can disable file list display or limit length (`max_file_list_length`). * By default some terminals display ascii color with maximum color saturation - which makes colored text of different perceptual brightness. This makes it hard to read. + which makes colored text of different perceptual brightness. This makes it hard to read. If your terminal colors are configurable, try change it to softer (pastel) colors. @@ -155,9 +155,9 @@ to any of above locations and customize as needed. == Dependencies Most probably you don't need to install anything because not optional -dependencies are standard unix utils. +dependencies are standard unix utils. -* bash (tested with v3.2.33) +* bash (tested with v3.2.33) * sed * tput (terminfo) * tty (core utils) @@ -183,14 +183,14 @@ include::../volnitsky.com/project/howto-submit-patch.txt[] Nobody will use git-prompt if there will be delay in prompt display. Try to avoid use of external commands and subshells (backticks) in prompt_command_function. It is ok to use -time consuming ops in postconfig which is executed only once. +time consuming ops in postconfig which is executed only once. == Authors - Leonid Volnitsky (original author) , http://volnitsky.com - Niklas Hofer (CWD truncation) , httpx://github.com/niklas/[] - Lee Nussbaum (HG support) , httpx://github.com/wln[] - Albert Vernon http://xenoclub.wordpress.com[] -- Amir Yalon httpx://github.com/amiryal[] +- Amir Yalon httpx://github.com/amiryal[] - Martin httpx://github.com/jerrywho[] - Alexander Goldstein (emacs-shell, prompt chars) httpx://github.com/alexg0[] - Dmitry (bash completion) -- cgit v1.2.3