diff --git a/.zprezto/_.git/COMMIT_EDITMSG b/.zprezto/_.git/COMMIT_EDITMSG new file mode 100644 index 0000000..5373d73 --- /dev/null +++ b/.zprezto/_.git/COMMIT_EDITMSG @@ -0,0 +1 @@ +dummy comment diff --git a/.zprezto/_.git/FETCH_HEAD b/.zprezto/_.git/FETCH_HEAD new file mode 100644 index 0000000..881d0de --- /dev/null +++ b/.zprezto/_.git/FETCH_HEAD @@ -0,0 +1,31 @@ +4f19700919c8ebbaf75755fc0d03716d13183f49 branch 'master' of https://github.com/sorin-ionescu/prezto +d541eef923c24bf0983465c57c93504db3476985 not-for-merge branch 'issue/231-installer' of https://github.com/sorin-ionescu/prezto +5be4a78b55acba1fbfcb6a7767d7d0743623660d not-for-merge branch 'issue/276-readme-to-man-page' of https://github.com/sorin-ionescu/prezto +113f6763c22c31dff15a7f776c991596e150e4a1 not-for-merge branch 'issue/306-default-zstyle-function' of https://github.com/sorin-ionescu/prezto +2d1881c4660d012a0cb0c2c98a4a4cdf07f5ba5c not-for-merge branch 'issue/656-readd-z' of https://github.com/sorin-ionescu/prezto +5f675b0c670b5d2c24c79378962b78c391ec10a9 not-for-merge branch 'module/completion' of https://github.com/sorin-ionescu/prezto +729fd07ab03b0b9d070c63d6f4972960103294ba not-for-merge branch 'module/git/hub' of https://github.com/sorin-ionescu/prezto +5ecbb49630d8a9b74a66aa31d9f79d69bd355ec0 not-for-merge branch 'module/update' of https://github.com/sorin-ionescu/prezto +8e95c547d6b8d3207ba7d20065c69a3aa7f78257 not-for-merge branch 'module/zaw' of https://github.com/sorin-ionescu/prezto +e3696d2c2862a9c5cb57723dba2133b97cb7ab87 not-for-merge branch 'pull/517-auto-virtualenv' of https://github.com/sorin-ionescu/prezto +d196c6a15a2b7226a7b950996a707b6ee0c040d0 not-for-merge branch 'pull/533-git-branch-verbose' of https://github.com/sorin-ionescu/prezto +a97e8de21b162335fc33c119e2cbd903fee429b7 not-for-merge branch 'pull/539-pacman-list-explicit' of https://github.com/sorin-ionescu/prezto +36e24eeb08579316bb19cd6dd42c9c15d450e71b not-for-merge branch 'pull/552-git-hub-shorten-url' of https://github.com/sorin-ionescu/prezto +72f8d15b21dd82603d548531d62ae30ded5d24e7 not-for-merge branch 'pull/556-perlbrew-path-zstyle' of https://github.com/sorin-ionescu/prezto +9852150123d0bf24dc7b496873b1b8af0f41a299 not-for-merge branch 'pull/562-ignored-user-completion' of https://github.com/sorin-ionescu/prezto +c2d6b378a6b8fb5ad914b88134a05d121af4250a not-for-merge branch 'pull/563-control-arrow-key-bindings' of https://github.com/sorin-ionescu/prezto +5e6adf89b99c407d5961a7e30a201dcdd8aa9391 not-for-merge branch 'pull/582-tmux-attach-behaviour' of https://github.com/sorin-ionescu/prezto +b2d84afacf4e3477120e7397354457e58b3e3d4b not-for-merge branch 'pull/598-skip-virtualenv-init' of https://github.com/sorin-ionescu/prezto +5590b56a877e29bb49832f1bb00a89d7f034af40 not-for-merge branch 'pull/599-terminal-title' of https://github.com/sorin-ionescu/prezto +9dd65d3982c1265d5cca67edecf8a2a8067dd7a5 not-for-merge branch 'pull/607-tmux-session-name' of https://github.com/sorin-ionescu/prezto +9ab6ab0d6645b74ee81f5ab6610d093615beb6f5 not-for-merge branch 'pull/628-explainshell' of https://github.com/sorin-ionescu/prezto +55190ffb428aaf24eb43a960368aa152faf944e8 not-for-merge branch 'pull/636-vim-text-objects' of https://github.com/sorin-ionescu/prezto +729fd07ab03b0b9d070c63d6f4972960103294ba not-for-merge branch 'pull/638-execute-command-git' of https://github.com/sorin-ionescu/prezto +c3bd8a47088a1d9f1c1fe2bda023462d656dce80 not-for-merge branch 'pull/651-git-gpg-aliases' of https://github.com/sorin-ionescu/prezto +72328d0eedac99e1fe342ec31b0e1f4e85a0dc7b not-for-merge branch 'pull/715-git-ignore-template' of https://github.com/sorin-ionescu/prezto +fb13aa332738c8c414bc4cb602a9bc2378da2a27 not-for-merge branch 'revision/do-not-use' of https://github.com/sorin-ionescu/prezto +5c7bd2009cc3598e25b8cc607c199b75040e0f34 not-for-merge branch 'revision/prezto' of https://github.com/sorin-ionescu/prezto +8d9ec24335400a1796937bc8e9caa9830767a762 not-for-merge branch 'revision/use-command_not_found_handler' of https://github.com/sorin-ionescu/prezto +f5f295cc99d65edbcfeba24d992286bf7e76000f not-for-merge branch 'revision/zdotdir-prezto' of https://github.com/sorin-ionescu/prezto +b948e3630bb293993e314bcf2691a3ab5a9b23bc not-for-merge branch 'stashes' of https://github.com/sorin-ionescu/prezto +f2a826e963f06a204dc0e09c05fc3e5419799f52 not-for-merge branch 'theme/sorin' of https://github.com/sorin-ionescu/prezto diff --git a/.zprezto/_.git/HEAD b/.zprezto/_.git/HEAD new file mode 100644 index 0000000..cb089cd --- /dev/null +++ b/.zprezto/_.git/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/.zprezto/_.git/ORIG_HEAD b/.zprezto/_.git/ORIG_HEAD new file mode 100644 index 0000000..57c7dc0 --- /dev/null +++ b/.zprezto/_.git/ORIG_HEAD @@ -0,0 +1 @@ +771aeb37ae14d8c826b5c86d6e2fab85d156e767 diff --git a/.zprezto/_.git/config b/.zprezto/_.git/config new file mode 100755 index 0000000..cb8fdb6 --- /dev/null +++ b/.zprezto/_.git/config @@ -0,0 +1,25 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + ignorecase = true + precomposeunicode = true +[remote "origin"] + url = https://github.com/sorin-ionescu/prezto.git + fetch = +refs/heads/*:refs/remotes/origin/* +[branch "master"] + remote = origin + merge = refs/heads/master +[submodule "modules/completion/external"] + url = https://github.com/zsh-users/zsh-completions.git +[submodule "modules/history-substring-search/external"] + url = https://github.com/zsh-users/zsh-history-substring-search.git +[submodule "modules/prompt/external/agnoster"] + url = https://gist.github.com/3712874.git +[submodule "modules/prompt/external/powerline"] + url = https://github.com/davidjrice/prezto_powerline.git +[submodule "modules/prompt/functions/pure"] + url = https://github.com/sindresorhus/pure.git +[submodule "modules/syntax-highlighting/external"] + url = https://github.com/zsh-users/zsh-syntax-highlighting.git diff --git a/.zprezto/_.git/description b/.zprezto/_.git/description new file mode 100644 index 0000000..498b267 --- /dev/null +++ b/.zprezto/_.git/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/.zprezto/_.git/hooks/applypatch-msg.sample b/.zprezto/_.git/hooks/applypatch-msg.sample new file mode 100755 index 0000000..8b2a2fe --- /dev/null +++ b/.zprezto/_.git/hooks/applypatch-msg.sample @@ -0,0 +1,15 @@ +#!/bin/sh +# +# An example hook script to check the commit log message taken by +# applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. The hook is +# allowed to edit the commit message file. +# +# To enable this hook, rename this file to "applypatch-msg". + +. git-sh-setup +test -x "$GIT_DIR/hooks/commit-msg" && + exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"} +: diff --git a/.zprezto/_.git/hooks/commit-msg.sample b/.zprezto/_.git/hooks/commit-msg.sample new file mode 100755 index 0000000..b58d118 --- /dev/null +++ b/.zprezto/_.git/hooks/commit-msg.sample @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to check the commit log message. +# Called by "git commit" with one argument, the name of the file +# that has the commit message. The hook should exit with non-zero +# status after issuing an appropriate message if it wants to stop the +# commit. The hook is allowed to edit the commit message file. +# +# To enable this hook, rename this file to "commit-msg". + +# Uncomment the below to add a Signed-off-by line to the message. +# Doing this in a hook is a bad idea in general, but the prepare-commit-msg +# hook is more suited to it. +# +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" + +# This example catches duplicate Signed-off-by lines. + +test "" = "$(grep '^Signed-off-by: ' "$1" | + sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { + echo >&2 Duplicate Signed-off-by lines. + exit 1 +} diff --git a/.zprezto/_.git/hooks/post-update.sample b/.zprezto/_.git/hooks/post-update.sample new file mode 100755 index 0000000..ec17ec1 --- /dev/null +++ b/.zprezto/_.git/hooks/post-update.sample @@ -0,0 +1,8 @@ +#!/bin/sh +# +# An example hook script to prepare a packed repository for use over +# dumb transports. +# +# To enable this hook, rename this file to "post-update". + +exec git update-server-info diff --git a/.zprezto/_.git/hooks/pre-applypatch.sample b/.zprezto/_.git/hooks/pre-applypatch.sample new file mode 100755 index 0000000..b1f187c --- /dev/null +++ b/.zprezto/_.git/hooks/pre-applypatch.sample @@ -0,0 +1,14 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed +# by applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-applypatch". + +. git-sh-setup +test -x "$GIT_DIR/hooks/pre-commit" && + exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"} +: diff --git a/.zprezto/_.git/hooks/pre-commit.sample b/.zprezto/_.git/hooks/pre-commit.sample new file mode 100755 index 0000000..68d62d5 --- /dev/null +++ b/.zprezto/_.git/hooks/pre-commit.sample @@ -0,0 +1,49 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git commit" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message if +# it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-commit". + +if git rev-parse --verify HEAD >/dev/null 2>&1 +then + against=HEAD +else + # Initial commit: diff against an empty tree object + against=4b825dc642cb6eb9a060e54bf8d69288fbee4904 +fi + +# If you want to allow non-ASCII filenames set this variable to true. +allownonascii=$(git config --bool hooks.allownonascii) + +# Redirect output to stderr. +exec 1>&2 + +# Cross platform projects tend to avoid non-ASCII filenames; prevent +# them from being added to the repository. We exploit the fact that the +# printable range starts at the space character and ends with tilde. +if [ "$allownonascii" != "true" ] && + # Note that the use of brackets around a tr range is ok here, (it's + # even required, for portability to Solaris 10's /usr/bin/tr), since + # the square bracket bytes happen to fall in the designated range. + test $(git diff --cached --name-only --diff-filter=A -z $against | + LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 +then + cat <<\EOF +Error: Attempt to add a non-ASCII file name. + +This can cause problems if you want to work with people on other platforms. + +To be portable it is advisable to rename the file. + +If you know what you are doing you can disable this check using: + + git config hooks.allownonascii true +EOF + exit 1 +fi + +# If there are whitespace errors, print the offending file names and fail. +exec git diff-index --check --cached $against -- diff --git a/.zprezto/_.git/hooks/pre-push.sample b/.zprezto/_.git/hooks/pre-push.sample new file mode 100755 index 0000000..69e3c67 --- /dev/null +++ b/.zprezto/_.git/hooks/pre-push.sample @@ -0,0 +1,54 @@ +#!/bin/sh + +# An example hook script to verify what is about to be pushed. Called by "git +# push" after it has checked the remote status, but before anything has been +# pushed. If this script exits with a non-zero status nothing will be pushed. +# +# This hook is called with the following parameters: +# +# $1 -- Name of the remote to which the push is being done +# $2 -- URL to which the push is being done +# +# If pushing without using a named remote those arguments will be equal. +# +# Information about the commits which are being pushed is supplied as lines to +# the standard input in the form: +# +# +# +# This sample shows how to prevent push of commits where the log message starts +# with "WIP" (work in progress). + +remote="$1" +url="$2" + +z40=0000000000000000000000000000000000000000 + +IFS=' ' +while read local_ref local_sha remote_ref remote_sha +do + if [ "$local_sha" = $z40 ] + then + # Handle delete + : + else + if [ "$remote_sha" = $z40 ] + then + # New branch, examine all commits + range="$local_sha" + else + # Update to existing branch, examine new commits + range="$remote_sha..$local_sha" + fi + + # Check for WIP commit + commit=`git rev-list -n 1 --grep '^WIP' "$range"` + if [ -n "$commit" ] + then + echo >&2 "Found WIP commit in $local_ref, not pushing" + exit 1 + fi + fi +done + +exit 0 diff --git a/.zprezto/_.git/hooks/pre-rebase.sample b/.zprezto/_.git/hooks/pre-rebase.sample new file mode 100755 index 0000000..9773ed4 --- /dev/null +++ b/.zprezto/_.git/hooks/pre-rebase.sample @@ -0,0 +1,169 @@ +#!/bin/sh +# +# Copyright (c) 2006, 2008 Junio C Hamano +# +# The "pre-rebase" hook is run just before "git rebase" starts doing +# its job, and can prevent the command from running by exiting with +# non-zero status. +# +# The hook is called with the following parameters: +# +# $1 -- the upstream the series was forked from. +# $2 -- the branch being rebased (or empty when rebasing the current branch). +# +# This sample shows how to prevent topic branches that are already +# merged to 'next' branch from getting rebased, because allowing it +# would result in rebasing already published history. + +publish=next +basebranch="$1" +if test "$#" = 2 +then + topic="refs/heads/$2" +else + topic=`git symbolic-ref HEAD` || + exit 0 ;# we do not interrupt rebasing detached HEAD +fi + +case "$topic" in +refs/heads/??/*) + ;; +*) + exit 0 ;# we do not interrupt others. + ;; +esac + +# Now we are dealing with a topic branch being rebased +# on top of master. Is it OK to rebase it? + +# Does the topic really exist? +git show-ref -q "$topic" || { + echo >&2 "No such branch $topic" + exit 1 +} + +# Is topic fully merged to master? +not_in_master=`git rev-list --pretty=oneline ^master "$topic"` +if test -z "$not_in_master" +then + echo >&2 "$topic is fully merged to master; better remove it." + exit 1 ;# we could allow it, but there is no point. +fi + +# Is topic ever merged to next? If so you should not be rebasing it. +only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` +only_next_2=`git rev-list ^master ${publish} | sort` +if test "$only_next_1" = "$only_next_2" +then + not_in_topic=`git rev-list "^$topic" master` + if test -z "$not_in_topic" + then + echo >&2 "$topic is already up-to-date with master" + exit 1 ;# we could allow it, but there is no point. + else + exit 0 + fi +else + not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` + /usr/bin/perl -e ' + my $topic = $ARGV[0]; + my $msg = "* $topic has commits already merged to public branch:\n"; + my (%not_in_next) = map { + /^([0-9a-f]+) /; + ($1 => 1); + } split(/\n/, $ARGV[1]); + for my $elem (map { + /^([0-9a-f]+) (.*)$/; + [$1 => $2]; + } split(/\n/, $ARGV[2])) { + if (!exists $not_in_next{$elem->[0]}) { + if ($msg) { + print STDERR $msg; + undef $msg; + } + print STDERR " $elem->[1]\n"; + } + } + ' "$topic" "$not_in_next" "$not_in_master" + exit 1 +fi + +exit 0 + +################################################################ + +This sample hook safeguards topic branches that have been +published from being rewound. + +The workflow assumed here is: + + * Once a topic branch forks from "master", "master" is never + merged into it again (either directly or indirectly). + + * Once a topic branch is fully cooked and merged into "master", + it is deleted. If you need to build on top of it to correct + earlier mistakes, a new topic branch is created by forking at + the tip of the "master". This is not strictly necessary, but + it makes it easier to keep your history simple. + + * Whenever you need to test or publish your changes to topic + branches, merge them into "next" branch. + +The script, being an example, hardcodes the publish branch name +to be "next", but it is trivial to make it configurable via +$GIT_DIR/config mechanism. + +With this workflow, you would want to know: + +(1) ... if a topic branch has ever been merged to "next". Young + topic branches can have stupid mistakes you would rather + clean up before publishing, and things that have not been + merged into other branches can be easily rebased without + affecting other people. But once it is published, you would + not want to rewind it. + +(2) ... if a topic branch has been fully merged to "master". + Then you can delete it. More importantly, you should not + build on top of it -- other people may already want to + change things related to the topic as patches against your + "master", so if you need further changes, it is better to + fork the topic (perhaps with the same name) afresh from the + tip of "master". + +Let's look at this example: + + o---o---o---o---o---o---o---o---o---o "next" + / / / / + / a---a---b A / / + / / / / + / / c---c---c---c B / + / / / \ / + / / / b---b C \ / + / / / / \ / + ---o---o---o---o---o---o---o---o---o---o---o "master" + + +A, B and C are topic branches. + + * A has one fix since it was merged up to "next". + + * B has finished. It has been fully merged up to "master" and "next", + and is ready to be deleted. + + * C has not merged to "next" at all. + +We would want to allow C to be rebased, refuse A, and encourage +B to be deleted. + +To compute (1): + + git rev-list ^master ^topic next + git rev-list ^master next + + if these match, topic has not merged in next at all. + +To compute (2): + + git rev-list master..topic + + if this is empty, it is fully merged to "master". diff --git a/.zprezto/_.git/hooks/prepare-commit-msg.sample b/.zprezto/_.git/hooks/prepare-commit-msg.sample new file mode 100755 index 0000000..f093a02 --- /dev/null +++ b/.zprezto/_.git/hooks/prepare-commit-msg.sample @@ -0,0 +1,36 @@ +#!/bin/sh +# +# An example hook script to prepare the commit log message. +# Called by "git commit" with the name of the file that has the +# commit message, followed by the description of the commit +# message's source. The hook's purpose is to edit the commit +# message file. If the hook fails with a non-zero status, +# the commit is aborted. +# +# To enable this hook, rename this file to "prepare-commit-msg". + +# This hook includes three examples. The first comments out the +# "Conflicts:" part of a merge commit. +# +# The second includes the output of "git diff --name-status -r" +# into the message, just before the "git status" output. It is +# commented because it doesn't cope with --amend or with squashed +# commits. +# +# The third example adds a Signed-off-by line to the message, that can +# still be edited. This is rarely a good idea. + +case "$2,$3" in + merge,) + /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;; + +# ,|template,) +# /usr/bin/perl -i.bak -pe ' +# print "\n" . `git diff --cached --name-status -r` +# if /^#/ && $first++ == 0' "$1" ;; + + *) ;; +esac + +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" diff --git a/.zprezto/_.git/hooks/update.sample b/.zprezto/_.git/hooks/update.sample new file mode 100755 index 0000000..d847583 --- /dev/null +++ b/.zprezto/_.git/hooks/update.sample @@ -0,0 +1,128 @@ +#!/bin/sh +# +# An example hook script to blocks unannotated tags from entering. +# Called by "git receive-pack" with arguments: refname sha1-old sha1-new +# +# To enable this hook, rename this file to "update". +# +# Config +# ------ +# hooks.allowunannotated +# This boolean sets whether unannotated tags will be allowed into the +# repository. By default they won't be. +# hooks.allowdeletetag +# This boolean sets whether deleting tags will be allowed in the +# repository. By default they won't be. +# hooks.allowmodifytag +# This boolean sets whether a tag may be modified after creation. By default +# it won't be. +# hooks.allowdeletebranch +# This boolean sets whether deleting branches will be allowed in the +# repository. By default they won't be. +# hooks.denycreatebranch +# This boolean sets whether remotely creating branches will be denied +# in the repository. By default this is allowed. +# + +# --- Command line +refname="$1" +oldrev="$2" +newrev="$3" + +# --- Safety check +if [ -z "$GIT_DIR" ]; then + echo "Don't run this script from the command line." >&2 + echo " (if you want, you could supply GIT_DIR then run" >&2 + echo " $0 )" >&2 + exit 1 +fi + +if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then + echo "usage: $0 " >&2 + exit 1 +fi + +# --- Config +allowunannotated=$(git config --bool hooks.allowunannotated) +allowdeletebranch=$(git config --bool hooks.allowdeletebranch) +denycreatebranch=$(git config --bool hooks.denycreatebranch) +allowdeletetag=$(git config --bool hooks.allowdeletetag) +allowmodifytag=$(git config --bool hooks.allowmodifytag) + +# check for no description +projectdesc=$(sed -e '1q' "$GIT_DIR/description") +case "$projectdesc" in +"Unnamed repository"* | "") + echo "*** Project description file hasn't been set" >&2 + exit 1 + ;; +esac + +# --- Check types +# if $newrev is 0000...0000, it's a commit to delete a ref. +zero="0000000000000000000000000000000000000000" +if [ "$newrev" = "$zero" ]; then + newrev_type=delete +else + newrev_type=$(git cat-file -t $newrev) +fi + +case "$refname","$newrev_type" in + refs/tags/*,commit) + # un-annotated tag + short_refname=${refname##refs/tags/} + if [ "$allowunannotated" != "true" ]; then + echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2 + echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 + exit 1 + fi + ;; + refs/tags/*,delete) + # delete tag + if [ "$allowdeletetag" != "true" ]; then + echo "*** Deleting a tag is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/tags/*,tag) + # annotated tag + if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 + then + echo "*** Tag '$refname' already exists." >&2 + echo "*** Modifying a tag is not allowed in this repository." >&2 + exit 1 + fi + ;; + refs/heads/*,commit) + # branch + if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then + echo "*** Creating a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/heads/*,delete) + # delete branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/remotes/*,commit) + # tracking branch + ;; + refs/remotes/*,delete) + # delete tracking branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a tracking branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + *) + # Anything else (is there anything else?) + echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 + exit 1 + ;; +esac + +# --- Finished +exit 0 diff --git a/.zprezto/_.git/index b/.zprezto/_.git/index new file mode 100644 index 0000000..1bd1616 Binary files /dev/null and b/.zprezto/_.git/index differ diff --git a/.zprezto/_.git/info/exclude b/.zprezto/_.git/info/exclude new file mode 100644 index 0000000..a5196d1 --- /dev/null +++ b/.zprezto/_.git/info/exclude @@ -0,0 +1,6 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ diff --git a/.zprezto/_.git/logs/HEAD b/.zprezto/_.git/logs/HEAD new file mode 100644 index 0000000..7e3ffa7 --- /dev/null +++ b/.zprezto/_.git/logs/HEAD @@ -0,0 +1,4 @@ +0000000000000000000000000000000000000000 f2a826e963f06a204dc0e09c05fc3e5419799f52 Abra 1443994566 +0400 clone: from https://github.com/sorin-ionescu/prezto.git +f2a826e963f06a204dc0e09c05fc3e5419799f52 7227c4f0bef5f8ae787c65150d7a7403394fff48 Abra 1456189968 +0400 pull: Fast-forward +7227c4f0bef5f8ae787c65150d7a7403394fff48 771aeb37ae14d8c826b5c86d6e2fab85d156e767 Andrey Anurin 1463466088 -0700 commit: dummy comment +771aeb37ae14d8c826b5c86d6e2fab85d156e767 ef60ce5dd6f18fca3bb49a897250e075ded71180 Andrey Anurin 1463466100 -0700 pull: Merge made by the 'recursive' strategy. diff --git a/.zprezto/_.git/logs/refs/heads/master b/.zprezto/_.git/logs/refs/heads/master new file mode 100644 index 0000000..7e3ffa7 --- /dev/null +++ b/.zprezto/_.git/logs/refs/heads/master @@ -0,0 +1,4 @@ +0000000000000000000000000000000000000000 f2a826e963f06a204dc0e09c05fc3e5419799f52 Abra 1443994566 +0400 clone: from https://github.com/sorin-ionescu/prezto.git +f2a826e963f06a204dc0e09c05fc3e5419799f52 7227c4f0bef5f8ae787c65150d7a7403394fff48 Abra 1456189968 +0400 pull: Fast-forward +7227c4f0bef5f8ae787c65150d7a7403394fff48 771aeb37ae14d8c826b5c86d6e2fab85d156e767 Andrey Anurin 1463466088 -0700 commit: dummy comment +771aeb37ae14d8c826b5c86d6e2fab85d156e767 ef60ce5dd6f18fca3bb49a897250e075ded71180 Andrey Anurin 1463466100 -0700 pull: Merge made by the 'recursive' strategy. diff --git a/.zprezto/_.git/logs/refs/remotes/origin/HEAD b/.zprezto/_.git/logs/refs/remotes/origin/HEAD new file mode 100644 index 0000000..b8a9f7c --- /dev/null +++ b/.zprezto/_.git/logs/refs/remotes/origin/HEAD @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 f2a826e963f06a204dc0e09c05fc3e5419799f52 Abra 1443994566 +0400 clone: from https://github.com/sorin-ionescu/prezto.git diff --git a/.zprezto/_.git/logs/refs/remotes/origin/master b/.zprezto/_.git/logs/refs/remotes/origin/master new file mode 100644 index 0000000..30c1b3c --- /dev/null +++ b/.zprezto/_.git/logs/refs/remotes/origin/master @@ -0,0 +1,2 @@ +f2a826e963f06a204dc0e09c05fc3e5419799f52 7227c4f0bef5f8ae787c65150d7a7403394fff48 Abra 1456189967 +0400 pull: fast-forward +7227c4f0bef5f8ae787c65150d7a7403394fff48 4f19700919c8ebbaf75755fc0d03716d13183f49 Andrey Anurin 1463466097 -0700 pull: fast-forward diff --git a/.zprezto/_.git/modules/modules/completion/external/FETCH_HEAD b/.zprezto/_.git/modules/modules/completion/external/FETCH_HEAD new file mode 100644 index 0000000..a900e8e --- /dev/null +++ b/.zprezto/_.git/modules/modules/completion/external/FETCH_HEAD @@ -0,0 +1,7 @@ +69e89c5e4a1eae49325314df3718f0c734536e2a not-for-merge branch 'master' of https://github.com/zsh-users/zsh-completions +0e525e909316fb8e0f2a7bbb05d7bfc6fddbcfd1 not-for-merge tag '0.13.0' of https://github.com/zsh-users/zsh-completions +173ae7249a6ab4a5b70bebb283f3f156eb79f908 not-for-merge tag '0.14.0' of https://github.com/zsh-users/zsh-completions +6953a4f892df1095e48d43751ccaf9e3ece02190 not-for-merge tag '0.15.0' of https://github.com/zsh-users/zsh-completions +3a2bb8781d32d05d1bf05deeeb476beb651e8272 not-for-merge tag '0.16.0' of https://github.com/zsh-users/zsh-completions +2082c7573fc1cd393ea0b2948aff6f0bdf3798cd not-for-merge tag '0.17.0' of https://github.com/zsh-users/zsh-completions +17743e1e174830693026d3adbba265922440f48c not-for-merge tag '0.18.0' of https://github.com/zsh-users/zsh-completions diff --git a/.zprezto/_.git/modules/modules/completion/external/HEAD b/.zprezto/_.git/modules/modules/completion/external/HEAD new file mode 100644 index 0000000..241b066 --- /dev/null +++ b/.zprezto/_.git/modules/modules/completion/external/HEAD @@ -0,0 +1 @@ +c2dde89fb34e2734106e50689bf4127f6b0a288d diff --git a/.zprezto/_.git/modules/modules/completion/external/config b/.zprezto/_.git/modules/modules/completion/external/config new file mode 100755 index 0000000..04eb804 --- /dev/null +++ b/.zprezto/_.git/modules/modules/completion/external/config @@ -0,0 +1,14 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + worktree = ../../../../../modules/completion/external + ignorecase = true + precomposeunicode = true +[remote "origin"] + url = https://github.com/zsh-users/zsh-completions.git + fetch = +refs/heads/*:refs/remotes/origin/* +[branch "master"] + remote = origin + merge = refs/heads/master diff --git a/.zprezto/_.git/modules/modules/completion/external/description b/.zprezto/_.git/modules/modules/completion/external/description new file mode 100644 index 0000000..498b267 --- /dev/null +++ b/.zprezto/_.git/modules/modules/completion/external/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/.zprezto/_.git/modules/modules/completion/external/hooks/applypatch-msg.sample b/.zprezto/_.git/modules/modules/completion/external/hooks/applypatch-msg.sample new file mode 100755 index 0000000..8b2a2fe --- /dev/null +++ b/.zprezto/_.git/modules/modules/completion/external/hooks/applypatch-msg.sample @@ -0,0 +1,15 @@ +#!/bin/sh +# +# An example hook script to check the commit log message taken by +# applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. The hook is +# allowed to edit the commit message file. +# +# To enable this hook, rename this file to "applypatch-msg". + +. git-sh-setup +test -x "$GIT_DIR/hooks/commit-msg" && + exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"} +: diff --git a/.zprezto/_.git/modules/modules/completion/external/hooks/commit-msg.sample b/.zprezto/_.git/modules/modules/completion/external/hooks/commit-msg.sample new file mode 100755 index 0000000..b58d118 --- /dev/null +++ b/.zprezto/_.git/modules/modules/completion/external/hooks/commit-msg.sample @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to check the commit log message. +# Called by "git commit" with one argument, the name of the file +# that has the commit message. The hook should exit with non-zero +# status after issuing an appropriate message if it wants to stop the +# commit. The hook is allowed to edit the commit message file. +# +# To enable this hook, rename this file to "commit-msg". + +# Uncomment the below to add a Signed-off-by line to the message. +# Doing this in a hook is a bad idea in general, but the prepare-commit-msg +# hook is more suited to it. +# +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" + +# This example catches duplicate Signed-off-by lines. + +test "" = "$(grep '^Signed-off-by: ' "$1" | + sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { + echo >&2 Duplicate Signed-off-by lines. + exit 1 +} diff --git a/.zprezto/_.git/modules/modules/completion/external/hooks/post-update.sample b/.zprezto/_.git/modules/modules/completion/external/hooks/post-update.sample new file mode 100755 index 0000000..ec17ec1 --- /dev/null +++ b/.zprezto/_.git/modules/modules/completion/external/hooks/post-update.sample @@ -0,0 +1,8 @@ +#!/bin/sh +# +# An example hook script to prepare a packed repository for use over +# dumb transports. +# +# To enable this hook, rename this file to "post-update". + +exec git update-server-info diff --git a/.zprezto/_.git/modules/modules/completion/external/hooks/pre-applypatch.sample b/.zprezto/_.git/modules/modules/completion/external/hooks/pre-applypatch.sample new file mode 100755 index 0000000..b1f187c --- /dev/null +++ b/.zprezto/_.git/modules/modules/completion/external/hooks/pre-applypatch.sample @@ -0,0 +1,14 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed +# by applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-applypatch". + +. git-sh-setup +test -x "$GIT_DIR/hooks/pre-commit" && + exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"} +: diff --git a/.zprezto/_.git/modules/modules/completion/external/hooks/pre-commit.sample b/.zprezto/_.git/modules/modules/completion/external/hooks/pre-commit.sample new file mode 100755 index 0000000..68d62d5 --- /dev/null +++ b/.zprezto/_.git/modules/modules/completion/external/hooks/pre-commit.sample @@ -0,0 +1,49 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git commit" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message if +# it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-commit". + +if git rev-parse --verify HEAD >/dev/null 2>&1 +then + against=HEAD +else + # Initial commit: diff against an empty tree object + against=4b825dc642cb6eb9a060e54bf8d69288fbee4904 +fi + +# If you want to allow non-ASCII filenames set this variable to true. +allownonascii=$(git config --bool hooks.allownonascii) + +# Redirect output to stderr. +exec 1>&2 + +# Cross platform projects tend to avoid non-ASCII filenames; prevent +# them from being added to the repository. We exploit the fact that the +# printable range starts at the space character and ends with tilde. +if [ "$allownonascii" != "true" ] && + # Note that the use of brackets around a tr range is ok here, (it's + # even required, for portability to Solaris 10's /usr/bin/tr), since + # the square bracket bytes happen to fall in the designated range. + test $(git diff --cached --name-only --diff-filter=A -z $against | + LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 +then + cat <<\EOF +Error: Attempt to add a non-ASCII file name. + +This can cause problems if you want to work with people on other platforms. + +To be portable it is advisable to rename the file. + +If you know what you are doing you can disable this check using: + + git config hooks.allownonascii true +EOF + exit 1 +fi + +# If there are whitespace errors, print the offending file names and fail. +exec git diff-index --check --cached $against -- diff --git a/.zprezto/_.git/modules/modules/completion/external/hooks/pre-push.sample b/.zprezto/_.git/modules/modules/completion/external/hooks/pre-push.sample new file mode 100755 index 0000000..69e3c67 --- /dev/null +++ b/.zprezto/_.git/modules/modules/completion/external/hooks/pre-push.sample @@ -0,0 +1,54 @@ +#!/bin/sh + +# An example hook script to verify what is about to be pushed. Called by "git +# push" after it has checked the remote status, but before anything has been +# pushed. If this script exits with a non-zero status nothing will be pushed. +# +# This hook is called with the following parameters: +# +# $1 -- Name of the remote to which the push is being done +# $2 -- URL to which the push is being done +# +# If pushing without using a named remote those arguments will be equal. +# +# Information about the commits which are being pushed is supplied as lines to +# the standard input in the form: +# +# +# +# This sample shows how to prevent push of commits where the log message starts +# with "WIP" (work in progress). + +remote="$1" +url="$2" + +z40=0000000000000000000000000000000000000000 + +IFS=' ' +while read local_ref local_sha remote_ref remote_sha +do + if [ "$local_sha" = $z40 ] + then + # Handle delete + : + else + if [ "$remote_sha" = $z40 ] + then + # New branch, examine all commits + range="$local_sha" + else + # Update to existing branch, examine new commits + range="$remote_sha..$local_sha" + fi + + # Check for WIP commit + commit=`git rev-list -n 1 --grep '^WIP' "$range"` + if [ -n "$commit" ] + then + echo >&2 "Found WIP commit in $local_ref, not pushing" + exit 1 + fi + fi +done + +exit 0 diff --git a/.zprezto/_.git/modules/modules/completion/external/hooks/pre-rebase.sample b/.zprezto/_.git/modules/modules/completion/external/hooks/pre-rebase.sample new file mode 100755 index 0000000..9773ed4 --- /dev/null +++ b/.zprezto/_.git/modules/modules/completion/external/hooks/pre-rebase.sample @@ -0,0 +1,169 @@ +#!/bin/sh +# +# Copyright (c) 2006, 2008 Junio C Hamano +# +# The "pre-rebase" hook is run just before "git rebase" starts doing +# its job, and can prevent the command from running by exiting with +# non-zero status. +# +# The hook is called with the following parameters: +# +# $1 -- the upstream the series was forked from. +# $2 -- the branch being rebased (or empty when rebasing the current branch). +# +# This sample shows how to prevent topic branches that are already +# merged to 'next' branch from getting rebased, because allowing it +# would result in rebasing already published history. + +publish=next +basebranch="$1" +if test "$#" = 2 +then + topic="refs/heads/$2" +else + topic=`git symbolic-ref HEAD` || + exit 0 ;# we do not interrupt rebasing detached HEAD +fi + +case "$topic" in +refs/heads/??/*) + ;; +*) + exit 0 ;# we do not interrupt others. + ;; +esac + +# Now we are dealing with a topic branch being rebased +# on top of master. Is it OK to rebase it? + +# Does the topic really exist? +git show-ref -q "$topic" || { + echo >&2 "No such branch $topic" + exit 1 +} + +# Is topic fully merged to master? +not_in_master=`git rev-list --pretty=oneline ^master "$topic"` +if test -z "$not_in_master" +then + echo >&2 "$topic is fully merged to master; better remove it." + exit 1 ;# we could allow it, but there is no point. +fi + +# Is topic ever merged to next? If so you should not be rebasing it. +only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` +only_next_2=`git rev-list ^master ${publish} | sort` +if test "$only_next_1" = "$only_next_2" +then + not_in_topic=`git rev-list "^$topic" master` + if test -z "$not_in_topic" + then + echo >&2 "$topic is already up-to-date with master" + exit 1 ;# we could allow it, but there is no point. + else + exit 0 + fi +else + not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` + /usr/bin/perl -e ' + my $topic = $ARGV[0]; + my $msg = "* $topic has commits already merged to public branch:\n"; + my (%not_in_next) = map { + /^([0-9a-f]+) /; + ($1 => 1); + } split(/\n/, $ARGV[1]); + for my $elem (map { + /^([0-9a-f]+) (.*)$/; + [$1 => $2]; + } split(/\n/, $ARGV[2])) { + if (!exists $not_in_next{$elem->[0]}) { + if ($msg) { + print STDERR $msg; + undef $msg; + } + print STDERR " $elem->[1]\n"; + } + } + ' "$topic" "$not_in_next" "$not_in_master" + exit 1 +fi + +exit 0 + +################################################################ + +This sample hook safeguards topic branches that have been +published from being rewound. + +The workflow assumed here is: + + * Once a topic branch forks from "master", "master" is never + merged into it again (either directly or indirectly). + + * Once a topic branch is fully cooked and merged into "master", + it is deleted. If you need to build on top of it to correct + earlier mistakes, a new topic branch is created by forking at + the tip of the "master". This is not strictly necessary, but + it makes it easier to keep your history simple. + + * Whenever you need to test or publish your changes to topic + branches, merge them into "next" branch. + +The script, being an example, hardcodes the publish branch name +to be "next", but it is trivial to make it configurable via +$GIT_DIR/config mechanism. + +With this workflow, you would want to know: + +(1) ... if a topic branch has ever been merged to "next". Young + topic branches can have stupid mistakes you would rather + clean up before publishing, and things that have not been + merged into other branches can be easily rebased without + affecting other people. But once it is published, you would + not want to rewind it. + +(2) ... if a topic branch has been fully merged to "master". + Then you can delete it. More importantly, you should not + build on top of it -- other people may already want to + change things related to the topic as patches against your + "master", so if you need further changes, it is better to + fork the topic (perhaps with the same name) afresh from the + tip of "master". + +Let's look at this example: + + o---o---o---o---o---o---o---o---o---o "next" + / / / / + / a---a---b A / / + / / / / + / / c---c---c---c B / + / / / \ / + / / / b---b C \ / + / / / / \ / + ---o---o---o---o---o---o---o---o---o---o---o "master" + + +A, B and C are topic branches. + + * A has one fix since it was merged up to "next". + + * B has finished. It has been fully merged up to "master" and "next", + and is ready to be deleted. + + * C has not merged to "next" at all. + +We would want to allow C to be rebased, refuse A, and encourage +B to be deleted. + +To compute (1): + + git rev-list ^master ^topic next + git rev-list ^master next + + if these match, topic has not merged in next at all. + +To compute (2): + + git rev-list master..topic + + if this is empty, it is fully merged to "master". diff --git a/.zprezto/_.git/modules/modules/completion/external/hooks/prepare-commit-msg.sample b/.zprezto/_.git/modules/modules/completion/external/hooks/prepare-commit-msg.sample new file mode 100755 index 0000000..f093a02 --- /dev/null +++ b/.zprezto/_.git/modules/modules/completion/external/hooks/prepare-commit-msg.sample @@ -0,0 +1,36 @@ +#!/bin/sh +# +# An example hook script to prepare the commit log message. +# Called by "git commit" with the name of the file that has the +# commit message, followed by the description of the commit +# message's source. The hook's purpose is to edit the commit +# message file. If the hook fails with a non-zero status, +# the commit is aborted. +# +# To enable this hook, rename this file to "prepare-commit-msg". + +# This hook includes three examples. The first comments out the +# "Conflicts:" part of a merge commit. +# +# The second includes the output of "git diff --name-status -r" +# into the message, just before the "git status" output. It is +# commented because it doesn't cope with --amend or with squashed +# commits. +# +# The third example adds a Signed-off-by line to the message, that can +# still be edited. This is rarely a good idea. + +case "$2,$3" in + merge,) + /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;; + +# ,|template,) +# /usr/bin/perl -i.bak -pe ' +# print "\n" . `git diff --cached --name-status -r` +# if /^#/ && $first++ == 0' "$1" ;; + + *) ;; +esac + +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" diff --git a/.zprezto/_.git/modules/modules/completion/external/hooks/update.sample b/.zprezto/_.git/modules/modules/completion/external/hooks/update.sample new file mode 100755 index 0000000..d847583 --- /dev/null +++ b/.zprezto/_.git/modules/modules/completion/external/hooks/update.sample @@ -0,0 +1,128 @@ +#!/bin/sh +# +# An example hook script to blocks unannotated tags from entering. +# Called by "git receive-pack" with arguments: refname sha1-old sha1-new +# +# To enable this hook, rename this file to "update". +# +# Config +# ------ +# hooks.allowunannotated +# This boolean sets whether unannotated tags will be allowed into the +# repository. By default they won't be. +# hooks.allowdeletetag +# This boolean sets whether deleting tags will be allowed in the +# repository. By default they won't be. +# hooks.allowmodifytag +# This boolean sets whether a tag may be modified after creation. By default +# it won't be. +# hooks.allowdeletebranch +# This boolean sets whether deleting branches will be allowed in the +# repository. By default they won't be. +# hooks.denycreatebranch +# This boolean sets whether remotely creating branches will be denied +# in the repository. By default this is allowed. +# + +# --- Command line +refname="$1" +oldrev="$2" +newrev="$3" + +# --- Safety check +if [ -z "$GIT_DIR" ]; then + echo "Don't run this script from the command line." >&2 + echo " (if you want, you could supply GIT_DIR then run" >&2 + echo " $0 )" >&2 + exit 1 +fi + +if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then + echo "usage: $0 " >&2 + exit 1 +fi + +# --- Config +allowunannotated=$(git config --bool hooks.allowunannotated) +allowdeletebranch=$(git config --bool hooks.allowdeletebranch) +denycreatebranch=$(git config --bool hooks.denycreatebranch) +allowdeletetag=$(git config --bool hooks.allowdeletetag) +allowmodifytag=$(git config --bool hooks.allowmodifytag) + +# check for no description +projectdesc=$(sed -e '1q' "$GIT_DIR/description") +case "$projectdesc" in +"Unnamed repository"* | "") + echo "*** Project description file hasn't been set" >&2 + exit 1 + ;; +esac + +# --- Check types +# if $newrev is 0000...0000, it's a commit to delete a ref. +zero="0000000000000000000000000000000000000000" +if [ "$newrev" = "$zero" ]; then + newrev_type=delete +else + newrev_type=$(git cat-file -t $newrev) +fi + +case "$refname","$newrev_type" in + refs/tags/*,commit) + # un-annotated tag + short_refname=${refname##refs/tags/} + if [ "$allowunannotated" != "true" ]; then + echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2 + echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 + exit 1 + fi + ;; + refs/tags/*,delete) + # delete tag + if [ "$allowdeletetag" != "true" ]; then + echo "*** Deleting a tag is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/tags/*,tag) + # annotated tag + if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 + then + echo "*** Tag '$refname' already exists." >&2 + echo "*** Modifying a tag is not allowed in this repository." >&2 + exit 1 + fi + ;; + refs/heads/*,commit) + # branch + if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then + echo "*** Creating a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/heads/*,delete) + # delete branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/remotes/*,commit) + # tracking branch + ;; + refs/remotes/*,delete) + # delete tracking branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a tracking branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + *) + # Anything else (is there anything else?) + echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 + exit 1 + ;; +esac + +# --- Finished +exit 0 diff --git a/.zprezto/_.git/modules/modules/completion/external/index b/.zprezto/_.git/modules/modules/completion/external/index new file mode 100644 index 0000000..c5c1ecf Binary files /dev/null and b/.zprezto/_.git/modules/modules/completion/external/index differ diff --git a/.zprezto/_.git/modules/modules/completion/external/info/exclude b/.zprezto/_.git/modules/modules/completion/external/info/exclude new file mode 100644 index 0000000..a5196d1 --- /dev/null +++ b/.zprezto/_.git/modules/modules/completion/external/info/exclude @@ -0,0 +1,6 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ diff --git a/.zprezto/_.git/modules/modules/completion/external/logs/HEAD b/.zprezto/_.git/modules/modules/completion/external/logs/HEAD new file mode 100644 index 0000000..e80ccac --- /dev/null +++ b/.zprezto/_.git/modules/modules/completion/external/logs/HEAD @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 c2dde89fb34e2734106e50689bf4127f6b0a288d Abra 1443994570 +0400 clone: from https://github.com/zsh-users/zsh-completions.git +c2dde89fb34e2734106e50689bf4127f6b0a288d 68c949470eaa87c5d67080d32fb2b69c8b837eb4 Abra 1443994570 +0400 checkout: moving from master to 68c949470eaa87c5d67080d32fb2b69c8b837eb4 +68c949470eaa87c5d67080d32fb2b69c8b837eb4 c2dde89fb34e2734106e50689bf4127f6b0a288d Abra 1456189975 +0400 checkout: moving from 68c949470eaa87c5d67080d32fb2b69c8b837eb4 to c2dde89fb34e2734106e50689bf4127f6b0a288d diff --git a/.zprezto/_.git/modules/modules/completion/external/logs/refs/heads/master b/.zprezto/_.git/modules/modules/completion/external/logs/refs/heads/master new file mode 100644 index 0000000..2dca4c7 --- /dev/null +++ b/.zprezto/_.git/modules/modules/completion/external/logs/refs/heads/master @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 c2dde89fb34e2734106e50689bf4127f6b0a288d Abra 1443994570 +0400 clone: from https://github.com/zsh-users/zsh-completions.git diff --git a/.zprezto/_.git/modules/modules/completion/external/logs/refs/remotes/origin/HEAD b/.zprezto/_.git/modules/modules/completion/external/logs/refs/remotes/origin/HEAD new file mode 100644 index 0000000..2dca4c7 --- /dev/null +++ b/.zprezto/_.git/modules/modules/completion/external/logs/refs/remotes/origin/HEAD @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 c2dde89fb34e2734106e50689bf4127f6b0a288d Abra 1443994570 +0400 clone: from https://github.com/zsh-users/zsh-completions.git diff --git a/.zprezto/_.git/modules/modules/completion/external/logs/refs/remotes/origin/master b/.zprezto/_.git/modules/modules/completion/external/logs/refs/remotes/origin/master new file mode 100644 index 0000000..30eb0ed --- /dev/null +++ b/.zprezto/_.git/modules/modules/completion/external/logs/refs/remotes/origin/master @@ -0,0 +1 @@ +c2dde89fb34e2734106e50689bf4127f6b0a288d 69e89c5e4a1eae49325314df3718f0c734536e2a Andrey Anurin 1463466098 -0700 pull: fast-forward diff --git a/.zprezto/_.git/modules/modules/completion/external/objects/pack/pack-ad103400644189bbed239221ed739b79db895df0.idx b/.zprezto/_.git/modules/modules/completion/external/objects/pack/pack-ad103400644189bbed239221ed739b79db895df0.idx new file mode 100644 index 0000000..a408af7 Binary files /dev/null and b/.zprezto/_.git/modules/modules/completion/external/objects/pack/pack-ad103400644189bbed239221ed739b79db895df0.idx differ diff --git a/.zprezto/_.git/modules/modules/completion/external/objects/pack/pack-ad103400644189bbed239221ed739b79db895df0.pack b/.zprezto/_.git/modules/modules/completion/external/objects/pack/pack-ad103400644189bbed239221ed739b79db895df0.pack new file mode 100644 index 0000000..f9d443f Binary files /dev/null and b/.zprezto/_.git/modules/modules/completion/external/objects/pack/pack-ad103400644189bbed239221ed739b79db895df0.pack differ diff --git a/.zprezto/_.git/modules/modules/completion/external/objects/pack/pack-befd74cb623a33beed5477168a79c0ecec4678f6.idx b/.zprezto/_.git/modules/modules/completion/external/objects/pack/pack-befd74cb623a33beed5477168a79c0ecec4678f6.idx new file mode 100644 index 0000000..b09eced Binary files /dev/null and b/.zprezto/_.git/modules/modules/completion/external/objects/pack/pack-befd74cb623a33beed5477168a79c0ecec4678f6.idx differ diff --git a/.zprezto/_.git/modules/modules/completion/external/objects/pack/pack-befd74cb623a33beed5477168a79c0ecec4678f6.pack b/.zprezto/_.git/modules/modules/completion/external/objects/pack/pack-befd74cb623a33beed5477168a79c0ecec4678f6.pack new file mode 100644 index 0000000..d9712bd Binary files /dev/null and b/.zprezto/_.git/modules/modules/completion/external/objects/pack/pack-befd74cb623a33beed5477168a79c0ecec4678f6.pack differ diff --git a/.zprezto/_.git/modules/modules/completion/external/packed-refs b/.zprezto/_.git/modules/modules/completion/external/packed-refs new file mode 100644 index 0000000..1549ee9 --- /dev/null +++ b/.zprezto/_.git/modules/modules/completion/external/packed-refs @@ -0,0 +1,20 @@ +# pack-refs with: peeled fully-peeled +520922c22769ca4b55f27680c8e0c25bf610f783 refs/remotes/origin/issue-338 +c2dde89fb34e2734106e50689bf4127f6b0a288d refs/remotes/origin/master +1f8a0c9d92efb2da0c476e395d5ed5050f06399b refs/tags/0.1.0 +662229f6f0ce391ef7c1a41c398e28a31e847182 refs/tags/0.10.0 +c75296de9cafeb360066065acbf2935964d70431 refs/tags/0.11.0 +5e3151d03a91954102e8a4d661d65f9604aabbfa refs/tags/0.12.0 +649c6cea337b71bd85f7b7a223bc21f810239775 refs/tags/0.2.0 +9e443566686ee574b9d66e445d73fd74c3e88c5d refs/tags/0.2.1 +acf27d00448ef62ae6901b59afc5718c829c337e refs/tags/0.3.0 +^62436acb8acbc3db4993142e84b4e851ab744213 +b5d080b9eefa456c7cd1ab1d61f4350fe1b23cd0 refs/tags/0.4.0 +f6108b8c4250565611a08b164cfdc85e6c76ee88 refs/tags/0.5.0 +3497b4841cb961e7db04e2a3bfe69b2dbec66427 refs/tags/0.5.1 +d54358a43ccec2323d012192aa213a189d877156 refs/tags/0.5.2 +f09394f71c27c76788785d851ab093ded1593705 refs/tags/0.6.0 +b0e171924ee20e38e2ecc2dc0f3ec7edf700f2c9 refs/tags/0.6.1 +9cca892132219e89299750d501d4693a98f5f5ee refs/tags/0.7.0 +13715a7e50f67458b2eb2d9b4125810c3102ad94 refs/tags/0.8.0 +53dd086f56f4d947be3a4b97c57f6c1f8a61900d refs/tags/0.9.0 diff --git a/.zprezto/_.git/modules/modules/completion/external/refs/heads/master b/.zprezto/_.git/modules/modules/completion/external/refs/heads/master new file mode 100644 index 0000000..241b066 --- /dev/null +++ b/.zprezto/_.git/modules/modules/completion/external/refs/heads/master @@ -0,0 +1 @@ +c2dde89fb34e2734106e50689bf4127f6b0a288d diff --git a/.zprezto/_.git/modules/modules/completion/external/refs/remotes/origin/HEAD b/.zprezto/_.git/modules/modules/completion/external/refs/remotes/origin/HEAD new file mode 100644 index 0000000..6efe28f --- /dev/null +++ b/.zprezto/_.git/modules/modules/completion/external/refs/remotes/origin/HEAD @@ -0,0 +1 @@ +ref: refs/remotes/origin/master diff --git a/.zprezto/_.git/modules/modules/completion/external/refs/remotes/origin/master b/.zprezto/_.git/modules/modules/completion/external/refs/remotes/origin/master new file mode 100644 index 0000000..1a624db --- /dev/null +++ b/.zprezto/_.git/modules/modules/completion/external/refs/remotes/origin/master @@ -0,0 +1 @@ +69e89c5e4a1eae49325314df3718f0c734536e2a diff --git a/.zprezto/_.git/modules/modules/completion/external/refs/tags/0.13.0 b/.zprezto/_.git/modules/modules/completion/external/refs/tags/0.13.0 new file mode 100644 index 0000000..72d88db --- /dev/null +++ b/.zprezto/_.git/modules/modules/completion/external/refs/tags/0.13.0 @@ -0,0 +1 @@ +0e525e909316fb8e0f2a7bbb05d7bfc6fddbcfd1 diff --git a/.zprezto/_.git/modules/modules/completion/external/refs/tags/0.14.0 b/.zprezto/_.git/modules/modules/completion/external/refs/tags/0.14.0 new file mode 100644 index 0000000..a992661 --- /dev/null +++ b/.zprezto/_.git/modules/modules/completion/external/refs/tags/0.14.0 @@ -0,0 +1 @@ +173ae7249a6ab4a5b70bebb283f3f156eb79f908 diff --git a/.zprezto/_.git/modules/modules/completion/external/refs/tags/0.15.0 b/.zprezto/_.git/modules/modules/completion/external/refs/tags/0.15.0 new file mode 100644 index 0000000..1878ff6 --- /dev/null +++ b/.zprezto/_.git/modules/modules/completion/external/refs/tags/0.15.0 @@ -0,0 +1 @@ +6953a4f892df1095e48d43751ccaf9e3ece02190 diff --git a/.zprezto/_.git/modules/modules/completion/external/refs/tags/0.16.0 b/.zprezto/_.git/modules/modules/completion/external/refs/tags/0.16.0 new file mode 100644 index 0000000..a005bc2 --- /dev/null +++ b/.zprezto/_.git/modules/modules/completion/external/refs/tags/0.16.0 @@ -0,0 +1 @@ +3a2bb8781d32d05d1bf05deeeb476beb651e8272 diff --git a/.zprezto/_.git/modules/modules/completion/external/refs/tags/0.17.0 b/.zprezto/_.git/modules/modules/completion/external/refs/tags/0.17.0 new file mode 100644 index 0000000..1fa1820 --- /dev/null +++ b/.zprezto/_.git/modules/modules/completion/external/refs/tags/0.17.0 @@ -0,0 +1 @@ +2082c7573fc1cd393ea0b2948aff6f0bdf3798cd diff --git a/.zprezto/_.git/modules/modules/completion/external/refs/tags/0.18.0 b/.zprezto/_.git/modules/modules/completion/external/refs/tags/0.18.0 new file mode 100644 index 0000000..b4bdae5 --- /dev/null +++ b/.zprezto/_.git/modules/modules/completion/external/refs/tags/0.18.0 @@ -0,0 +1 @@ +17743e1e174830693026d3adbba265922440f48c diff --git a/.zprezto/_.git/modules/modules/history-substring-search/external/FETCH_HEAD b/.zprezto/_.git/modules/modules/history-substring-search/external/FETCH_HEAD new file mode 100644 index 0000000..b1a6462 --- /dev/null +++ b/.zprezto/_.git/modules/modules/history-substring-search/external/FETCH_HEAD @@ -0,0 +1 @@ +f5c164d4c3af1f5bd068ee10f88b4c7b3a1fd841 not-for-merge branch 'master' of https://github.com/zsh-users/zsh-history-substring-search diff --git a/.zprezto/_.git/modules/modules/history-substring-search/external/HEAD b/.zprezto/_.git/modules/modules/history-substring-search/external/HEAD new file mode 100644 index 0000000..45b36d8 --- /dev/null +++ b/.zprezto/_.git/modules/modules/history-substring-search/external/HEAD @@ -0,0 +1 @@ +2c295432175990c1bb4e90bc13f609daa67a25d6 diff --git a/.zprezto/_.git/modules/modules/history-substring-search/external/config b/.zprezto/_.git/modules/modules/history-substring-search/external/config new file mode 100755 index 0000000..2d33179 --- /dev/null +++ b/.zprezto/_.git/modules/modules/history-substring-search/external/config @@ -0,0 +1,14 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + worktree = ../../../../../modules/history-substring-search/external + ignorecase = true + precomposeunicode = true +[remote "origin"] + url = https://github.com/zsh-users/zsh-history-substring-search.git + fetch = +refs/heads/*:refs/remotes/origin/* +[branch "master"] + remote = origin + merge = refs/heads/master diff --git a/.zprezto/_.git/modules/modules/history-substring-search/external/description b/.zprezto/_.git/modules/modules/history-substring-search/external/description new file mode 100644 index 0000000..498b267 --- /dev/null +++ b/.zprezto/_.git/modules/modules/history-substring-search/external/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/.zprezto/_.git/modules/modules/history-substring-search/external/hooks/applypatch-msg.sample b/.zprezto/_.git/modules/modules/history-substring-search/external/hooks/applypatch-msg.sample new file mode 100755 index 0000000..8b2a2fe --- /dev/null +++ b/.zprezto/_.git/modules/modules/history-substring-search/external/hooks/applypatch-msg.sample @@ -0,0 +1,15 @@ +#!/bin/sh +# +# An example hook script to check the commit log message taken by +# applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. The hook is +# allowed to edit the commit message file. +# +# To enable this hook, rename this file to "applypatch-msg". + +. git-sh-setup +test -x "$GIT_DIR/hooks/commit-msg" && + exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"} +: diff --git a/.zprezto/_.git/modules/modules/history-substring-search/external/hooks/commit-msg.sample b/.zprezto/_.git/modules/modules/history-substring-search/external/hooks/commit-msg.sample new file mode 100755 index 0000000..b58d118 --- /dev/null +++ b/.zprezto/_.git/modules/modules/history-substring-search/external/hooks/commit-msg.sample @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to check the commit log message. +# Called by "git commit" with one argument, the name of the file +# that has the commit message. The hook should exit with non-zero +# status after issuing an appropriate message if it wants to stop the +# commit. The hook is allowed to edit the commit message file. +# +# To enable this hook, rename this file to "commit-msg". + +# Uncomment the below to add a Signed-off-by line to the message. +# Doing this in a hook is a bad idea in general, but the prepare-commit-msg +# hook is more suited to it. +# +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" + +# This example catches duplicate Signed-off-by lines. + +test "" = "$(grep '^Signed-off-by: ' "$1" | + sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { + echo >&2 Duplicate Signed-off-by lines. + exit 1 +} diff --git a/.zprezto/_.git/modules/modules/history-substring-search/external/hooks/post-update.sample b/.zprezto/_.git/modules/modules/history-substring-search/external/hooks/post-update.sample new file mode 100755 index 0000000..ec17ec1 --- /dev/null +++ b/.zprezto/_.git/modules/modules/history-substring-search/external/hooks/post-update.sample @@ -0,0 +1,8 @@ +#!/bin/sh +# +# An example hook script to prepare a packed repository for use over +# dumb transports. +# +# To enable this hook, rename this file to "post-update". + +exec git update-server-info diff --git a/.zprezto/_.git/modules/modules/history-substring-search/external/hooks/pre-applypatch.sample b/.zprezto/_.git/modules/modules/history-substring-search/external/hooks/pre-applypatch.sample new file mode 100755 index 0000000..b1f187c --- /dev/null +++ b/.zprezto/_.git/modules/modules/history-substring-search/external/hooks/pre-applypatch.sample @@ -0,0 +1,14 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed +# by applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-applypatch". + +. git-sh-setup +test -x "$GIT_DIR/hooks/pre-commit" && + exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"} +: diff --git a/.zprezto/_.git/modules/modules/history-substring-search/external/hooks/pre-commit.sample b/.zprezto/_.git/modules/modules/history-substring-search/external/hooks/pre-commit.sample new file mode 100755 index 0000000..68d62d5 --- /dev/null +++ b/.zprezto/_.git/modules/modules/history-substring-search/external/hooks/pre-commit.sample @@ -0,0 +1,49 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git commit" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message if +# it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-commit". + +if git rev-parse --verify HEAD >/dev/null 2>&1 +then + against=HEAD +else + # Initial commit: diff against an empty tree object + against=4b825dc642cb6eb9a060e54bf8d69288fbee4904 +fi + +# If you want to allow non-ASCII filenames set this variable to true. +allownonascii=$(git config --bool hooks.allownonascii) + +# Redirect output to stderr. +exec 1>&2 + +# Cross platform projects tend to avoid non-ASCII filenames; prevent +# them from being added to the repository. We exploit the fact that the +# printable range starts at the space character and ends with tilde. +if [ "$allownonascii" != "true" ] && + # Note that the use of brackets around a tr range is ok here, (it's + # even required, for portability to Solaris 10's /usr/bin/tr), since + # the square bracket bytes happen to fall in the designated range. + test $(git diff --cached --name-only --diff-filter=A -z $against | + LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 +then + cat <<\EOF +Error: Attempt to add a non-ASCII file name. + +This can cause problems if you want to work with people on other platforms. + +To be portable it is advisable to rename the file. + +If you know what you are doing you can disable this check using: + + git config hooks.allownonascii true +EOF + exit 1 +fi + +# If there are whitespace errors, print the offending file names and fail. +exec git diff-index --check --cached $against -- diff --git a/.zprezto/_.git/modules/modules/history-substring-search/external/hooks/pre-push.sample b/.zprezto/_.git/modules/modules/history-substring-search/external/hooks/pre-push.sample new file mode 100755 index 0000000..69e3c67 --- /dev/null +++ b/.zprezto/_.git/modules/modules/history-substring-search/external/hooks/pre-push.sample @@ -0,0 +1,54 @@ +#!/bin/sh + +# An example hook script to verify what is about to be pushed. Called by "git +# push" after it has checked the remote status, but before anything has been +# pushed. If this script exits with a non-zero status nothing will be pushed. +# +# This hook is called with the following parameters: +# +# $1 -- Name of the remote to which the push is being done +# $2 -- URL to which the push is being done +# +# If pushing without using a named remote those arguments will be equal. +# +# Information about the commits which are being pushed is supplied as lines to +# the standard input in the form: +# +# +# +# This sample shows how to prevent push of commits where the log message starts +# with "WIP" (work in progress). + +remote="$1" +url="$2" + +z40=0000000000000000000000000000000000000000 + +IFS=' ' +while read local_ref local_sha remote_ref remote_sha +do + if [ "$local_sha" = $z40 ] + then + # Handle delete + : + else + if [ "$remote_sha" = $z40 ] + then + # New branch, examine all commits + range="$local_sha" + else + # Update to existing branch, examine new commits + range="$remote_sha..$local_sha" + fi + + # Check for WIP commit + commit=`git rev-list -n 1 --grep '^WIP' "$range"` + if [ -n "$commit" ] + then + echo >&2 "Found WIP commit in $local_ref, not pushing" + exit 1 + fi + fi +done + +exit 0 diff --git a/.zprezto/_.git/modules/modules/history-substring-search/external/hooks/pre-rebase.sample b/.zprezto/_.git/modules/modules/history-substring-search/external/hooks/pre-rebase.sample new file mode 100755 index 0000000..9773ed4 --- /dev/null +++ b/.zprezto/_.git/modules/modules/history-substring-search/external/hooks/pre-rebase.sample @@ -0,0 +1,169 @@ +#!/bin/sh +# +# Copyright (c) 2006, 2008 Junio C Hamano +# +# The "pre-rebase" hook is run just before "git rebase" starts doing +# its job, and can prevent the command from running by exiting with +# non-zero status. +# +# The hook is called with the following parameters: +# +# $1 -- the upstream the series was forked from. +# $2 -- the branch being rebased (or empty when rebasing the current branch). +# +# This sample shows how to prevent topic branches that are already +# merged to 'next' branch from getting rebased, because allowing it +# would result in rebasing already published history. + +publish=next +basebranch="$1" +if test "$#" = 2 +then + topic="refs/heads/$2" +else + topic=`git symbolic-ref HEAD` || + exit 0 ;# we do not interrupt rebasing detached HEAD +fi + +case "$topic" in +refs/heads/??/*) + ;; +*) + exit 0 ;# we do not interrupt others. + ;; +esac + +# Now we are dealing with a topic branch being rebased +# on top of master. Is it OK to rebase it? + +# Does the topic really exist? +git show-ref -q "$topic" || { + echo >&2 "No such branch $topic" + exit 1 +} + +# Is topic fully merged to master? +not_in_master=`git rev-list --pretty=oneline ^master "$topic"` +if test -z "$not_in_master" +then + echo >&2 "$topic is fully merged to master; better remove it." + exit 1 ;# we could allow it, but there is no point. +fi + +# Is topic ever merged to next? If so you should not be rebasing it. +only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` +only_next_2=`git rev-list ^master ${publish} | sort` +if test "$only_next_1" = "$only_next_2" +then + not_in_topic=`git rev-list "^$topic" master` + if test -z "$not_in_topic" + then + echo >&2 "$topic is already up-to-date with master" + exit 1 ;# we could allow it, but there is no point. + else + exit 0 + fi +else + not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` + /usr/bin/perl -e ' + my $topic = $ARGV[0]; + my $msg = "* $topic has commits already merged to public branch:\n"; + my (%not_in_next) = map { + /^([0-9a-f]+) /; + ($1 => 1); + } split(/\n/, $ARGV[1]); + for my $elem (map { + /^([0-9a-f]+) (.*)$/; + [$1 => $2]; + } split(/\n/, $ARGV[2])) { + if (!exists $not_in_next{$elem->[0]}) { + if ($msg) { + print STDERR $msg; + undef $msg; + } + print STDERR " $elem->[1]\n"; + } + } + ' "$topic" "$not_in_next" "$not_in_master" + exit 1 +fi + +exit 0 + +################################################################ + +This sample hook safeguards topic branches that have been +published from being rewound. + +The workflow assumed here is: + + * Once a topic branch forks from "master", "master" is never + merged into it again (either directly or indirectly). + + * Once a topic branch is fully cooked and merged into "master", + it is deleted. If you need to build on top of it to correct + earlier mistakes, a new topic branch is created by forking at + the tip of the "master". This is not strictly necessary, but + it makes it easier to keep your history simple. + + * Whenever you need to test or publish your changes to topic + branches, merge them into "next" branch. + +The script, being an example, hardcodes the publish branch name +to be "next", but it is trivial to make it configurable via +$GIT_DIR/config mechanism. + +With this workflow, you would want to know: + +(1) ... if a topic branch has ever been merged to "next". Young + topic branches can have stupid mistakes you would rather + clean up before publishing, and things that have not been + merged into other branches can be easily rebased without + affecting other people. But once it is published, you would + not want to rewind it. + +(2) ... if a topic branch has been fully merged to "master". + Then you can delete it. More importantly, you should not + build on top of it -- other people may already want to + change things related to the topic as patches against your + "master", so if you need further changes, it is better to + fork the topic (perhaps with the same name) afresh from the + tip of "master". + +Let's look at this example: + + o---o---o---o---o---o---o---o---o---o "next" + / / / / + / a---a---b A / / + / / / / + / / c---c---c---c B / + / / / \ / + / / / b---b C \ / + / / / / \ / + ---o---o---o---o---o---o---o---o---o---o---o "master" + + +A, B and C are topic branches. + + * A has one fix since it was merged up to "next". + + * B has finished. It has been fully merged up to "master" and "next", + and is ready to be deleted. + + * C has not merged to "next" at all. + +We would want to allow C to be rebased, refuse A, and encourage +B to be deleted. + +To compute (1): + + git rev-list ^master ^topic next + git rev-list ^master next + + if these match, topic has not merged in next at all. + +To compute (2): + + git rev-list master..topic + + if this is empty, it is fully merged to "master". diff --git a/.zprezto/_.git/modules/modules/history-substring-search/external/hooks/prepare-commit-msg.sample b/.zprezto/_.git/modules/modules/history-substring-search/external/hooks/prepare-commit-msg.sample new file mode 100755 index 0000000..f093a02 --- /dev/null +++ b/.zprezto/_.git/modules/modules/history-substring-search/external/hooks/prepare-commit-msg.sample @@ -0,0 +1,36 @@ +#!/bin/sh +# +# An example hook script to prepare the commit log message. +# Called by "git commit" with the name of the file that has the +# commit message, followed by the description of the commit +# message's source. The hook's purpose is to edit the commit +# message file. If the hook fails with a non-zero status, +# the commit is aborted. +# +# To enable this hook, rename this file to "prepare-commit-msg". + +# This hook includes three examples. The first comments out the +# "Conflicts:" part of a merge commit. +# +# The second includes the output of "git diff --name-status -r" +# into the message, just before the "git status" output. It is +# commented because it doesn't cope with --amend or with squashed +# commits. +# +# The third example adds a Signed-off-by line to the message, that can +# still be edited. This is rarely a good idea. + +case "$2,$3" in + merge,) + /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;; + +# ,|template,) +# /usr/bin/perl -i.bak -pe ' +# print "\n" . `git diff --cached --name-status -r` +# if /^#/ && $first++ == 0' "$1" ;; + + *) ;; +esac + +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" diff --git a/.zprezto/_.git/modules/modules/history-substring-search/external/hooks/update.sample b/.zprezto/_.git/modules/modules/history-substring-search/external/hooks/update.sample new file mode 100755 index 0000000..d847583 --- /dev/null +++ b/.zprezto/_.git/modules/modules/history-substring-search/external/hooks/update.sample @@ -0,0 +1,128 @@ +#!/bin/sh +# +# An example hook script to blocks unannotated tags from entering. +# Called by "git receive-pack" with arguments: refname sha1-old sha1-new +# +# To enable this hook, rename this file to "update". +# +# Config +# ------ +# hooks.allowunannotated +# This boolean sets whether unannotated tags will be allowed into the +# repository. By default they won't be. +# hooks.allowdeletetag +# This boolean sets whether deleting tags will be allowed in the +# repository. By default they won't be. +# hooks.allowmodifytag +# This boolean sets whether a tag may be modified after creation. By default +# it won't be. +# hooks.allowdeletebranch +# This boolean sets whether deleting branches will be allowed in the +# repository. By default they won't be. +# hooks.denycreatebranch +# This boolean sets whether remotely creating branches will be denied +# in the repository. By default this is allowed. +# + +# --- Command line +refname="$1" +oldrev="$2" +newrev="$3" + +# --- Safety check +if [ -z "$GIT_DIR" ]; then + echo "Don't run this script from the command line." >&2 + echo " (if you want, you could supply GIT_DIR then run" >&2 + echo " $0 )" >&2 + exit 1 +fi + +if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then + echo "usage: $0 " >&2 + exit 1 +fi + +# --- Config +allowunannotated=$(git config --bool hooks.allowunannotated) +allowdeletebranch=$(git config --bool hooks.allowdeletebranch) +denycreatebranch=$(git config --bool hooks.denycreatebranch) +allowdeletetag=$(git config --bool hooks.allowdeletetag) +allowmodifytag=$(git config --bool hooks.allowmodifytag) + +# check for no description +projectdesc=$(sed -e '1q' "$GIT_DIR/description") +case "$projectdesc" in +"Unnamed repository"* | "") + echo "*** Project description file hasn't been set" >&2 + exit 1 + ;; +esac + +# --- Check types +# if $newrev is 0000...0000, it's a commit to delete a ref. +zero="0000000000000000000000000000000000000000" +if [ "$newrev" = "$zero" ]; then + newrev_type=delete +else + newrev_type=$(git cat-file -t $newrev) +fi + +case "$refname","$newrev_type" in + refs/tags/*,commit) + # un-annotated tag + short_refname=${refname##refs/tags/} + if [ "$allowunannotated" != "true" ]; then + echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2 + echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 + exit 1 + fi + ;; + refs/tags/*,delete) + # delete tag + if [ "$allowdeletetag" != "true" ]; then + echo "*** Deleting a tag is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/tags/*,tag) + # annotated tag + if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 + then + echo "*** Tag '$refname' already exists." >&2 + echo "*** Modifying a tag is not allowed in this repository." >&2 + exit 1 + fi + ;; + refs/heads/*,commit) + # branch + if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then + echo "*** Creating a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/heads/*,delete) + # delete branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/remotes/*,commit) + # tracking branch + ;; + refs/remotes/*,delete) + # delete tracking branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a tracking branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + *) + # Anything else (is there anything else?) + echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 + exit 1 + ;; +esac + +# --- Finished +exit 0 diff --git a/.zprezto/_.git/modules/modules/history-substring-search/external/index b/.zprezto/_.git/modules/modules/history-substring-search/external/index new file mode 100644 index 0000000..8d23ce0 Binary files /dev/null and b/.zprezto/_.git/modules/modules/history-substring-search/external/index differ diff --git a/.zprezto/_.git/modules/modules/history-substring-search/external/info/exclude b/.zprezto/_.git/modules/modules/history-substring-search/external/info/exclude new file mode 100644 index 0000000..a5196d1 --- /dev/null +++ b/.zprezto/_.git/modules/modules/history-substring-search/external/info/exclude @@ -0,0 +1,6 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ diff --git a/.zprezto/_.git/modules/modules/history-substring-search/external/logs/HEAD b/.zprezto/_.git/modules/modules/history-substring-search/external/logs/HEAD new file mode 100644 index 0000000..551fb57 --- /dev/null +++ b/.zprezto/_.git/modules/modules/history-substring-search/external/logs/HEAD @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 2c295432175990c1bb4e90bc13f609daa67a25d6 Abra 1443994571 +0400 clone: from https://github.com/zsh-users/zsh-history-substring-search.git +2c295432175990c1bb4e90bc13f609daa67a25d6 c4a83561a12b898ff7145856d0e6ae50757e28ba Abra 1443994571 +0400 checkout: moving from master to c4a83561a12b898ff7145856d0e6ae50757e28ba +c4a83561a12b898ff7145856d0e6ae50757e28ba 2c295432175990c1bb4e90bc13f609daa67a25d6 Abra 1456189975 +0400 checkout: moving from c4a83561a12b898ff7145856d0e6ae50757e28ba to 2c295432175990c1bb4e90bc13f609daa67a25d6 diff --git a/.zprezto/_.git/modules/modules/history-substring-search/external/logs/refs/heads/master b/.zprezto/_.git/modules/modules/history-substring-search/external/logs/refs/heads/master new file mode 100644 index 0000000..b07fb63 --- /dev/null +++ b/.zprezto/_.git/modules/modules/history-substring-search/external/logs/refs/heads/master @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 2c295432175990c1bb4e90bc13f609daa67a25d6 Abra 1443994571 +0400 clone: from https://github.com/zsh-users/zsh-history-substring-search.git diff --git a/.zprezto/_.git/modules/modules/history-substring-search/external/logs/refs/remotes/origin/HEAD b/.zprezto/_.git/modules/modules/history-substring-search/external/logs/refs/remotes/origin/HEAD new file mode 100644 index 0000000..b07fb63 --- /dev/null +++ b/.zprezto/_.git/modules/modules/history-substring-search/external/logs/refs/remotes/origin/HEAD @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 2c295432175990c1bb4e90bc13f609daa67a25d6 Abra 1443994571 +0400 clone: from https://github.com/zsh-users/zsh-history-substring-search.git diff --git a/.zprezto/_.git/modules/modules/history-substring-search/external/logs/refs/remotes/origin/master b/.zprezto/_.git/modules/modules/history-substring-search/external/logs/refs/remotes/origin/master new file mode 100644 index 0000000..8d90e24 --- /dev/null +++ b/.zprezto/_.git/modules/modules/history-substring-search/external/logs/refs/remotes/origin/master @@ -0,0 +1 @@ +2c295432175990c1bb4e90bc13f609daa67a25d6 f5c164d4c3af1f5bd068ee10f88b4c7b3a1fd841 Andrey Anurin 1463466099 -0700 pull: fast-forward diff --git a/.zprezto/_.git/modules/modules/history-substring-search/external/objects/27/55ee474b635c7c39f4db796a0df65ab5be02f7 b/.zprezto/_.git/modules/modules/history-substring-search/external/objects/27/55ee474b635c7c39f4db796a0df65ab5be02f7 new file mode 100644 index 0000000..f9146a1 Binary files /dev/null and b/.zprezto/_.git/modules/modules/history-substring-search/external/objects/27/55ee474b635c7c39f4db796a0df65ab5be02f7 differ diff --git a/.zprezto/_.git/modules/modules/history-substring-search/external/objects/2f/8a5f8fe33d2f6165ac23336ed074296d65dec9 b/.zprezto/_.git/modules/modules/history-substring-search/external/objects/2f/8a5f8fe33d2f6165ac23336ed074296d65dec9 new file mode 100644 index 0000000..688e6ea Binary files /dev/null and b/.zprezto/_.git/modules/modules/history-substring-search/external/objects/2f/8a5f8fe33d2f6165ac23336ed074296d65dec9 differ diff --git a/.zprezto/_.git/modules/modules/history-substring-search/external/objects/43/2a0f2323ca926130b3fd8a9135bac41016d8b8 b/.zprezto/_.git/modules/modules/history-substring-search/external/objects/43/2a0f2323ca926130b3fd8a9135bac41016d8b8 new file mode 100644 index 0000000..e3b73a6 Binary files /dev/null and b/.zprezto/_.git/modules/modules/history-substring-search/external/objects/43/2a0f2323ca926130b3fd8a9135bac41016d8b8 differ diff --git a/.zprezto/_.git/modules/modules/history-substring-search/external/objects/75/f3b76c85ce742d69ac00bf4778baa9095a42db b/.zprezto/_.git/modules/modules/history-substring-search/external/objects/75/f3b76c85ce742d69ac00bf4778baa9095a42db new file mode 100644 index 0000000..dc2397f Binary files /dev/null and b/.zprezto/_.git/modules/modules/history-substring-search/external/objects/75/f3b76c85ce742d69ac00bf4778baa9095a42db differ diff --git a/.zprezto/_.git/modules/modules/history-substring-search/external/objects/7a/4b54b708ab88e0421097614f1acaa7a973c795 b/.zprezto/_.git/modules/modules/history-substring-search/external/objects/7a/4b54b708ab88e0421097614f1acaa7a973c795 new file mode 100644 index 0000000..461b083 --- /dev/null +++ b/.zprezto/_.git/modules/modules/history-substring-search/external/objects/7a/4b54b708ab88e0421097614f1acaa7a973c795 @@ -0,0 +1,3 @@ +xO;N0)VC"ػcKP!h8^?/[NO(h4߸T]"UFBiR#9h#Gvɏ۸Rg}ig9"9Ij0\r6I zq.A$+`a- +V_/hcqPõJu{Oqݓg(dpi5PEu\ߟ +Qs \ No newline at end of file diff --git a/.zprezto/_.git/modules/modules/history-substring-search/external/objects/b2/613c09661373fb418f0c4bb700cd51a7e65f1c b/.zprezto/_.git/modules/modules/history-substring-search/external/objects/b2/613c09661373fb418f0c4bb700cd51a7e65f1c new file mode 100644 index 0000000..2f5e5c5 Binary files /dev/null and b/.zprezto/_.git/modules/modules/history-substring-search/external/objects/b2/613c09661373fb418f0c4bb700cd51a7e65f1c differ diff --git a/.zprezto/_.git/modules/modules/history-substring-search/external/objects/bf/cd171f3ca9109aa17227916c15c04588976996 b/.zprezto/_.git/modules/modules/history-substring-search/external/objects/bf/cd171f3ca9109aa17227916c15c04588976996 new file mode 100644 index 0000000..ef61132 Binary files /dev/null and b/.zprezto/_.git/modules/modules/history-substring-search/external/objects/bf/cd171f3ca9109aa17227916c15c04588976996 differ diff --git a/.zprezto/_.git/modules/modules/history-substring-search/external/objects/e6/69342235e0a756875f6134f29be783291eb09f b/.zprezto/_.git/modules/modules/history-substring-search/external/objects/e6/69342235e0a756875f6134f29be783291eb09f new file mode 100644 index 0000000..0fddae4 --- /dev/null +++ b/.zprezto/_.git/modules/modules/history-substring-search/external/objects/e6/69342235e0a756875f6134f29be783291eb09f @@ -0,0 +1,2 @@ +xK +0@],L& ҍL#eDv \^l.H [.HH:Cz<Cvm\WOų-dg9"cpٔcPmpgq]V8׫.z[MI[nCScyG"˴-/9JE \ No newline at end of file diff --git a/.zprezto/_.git/modules/modules/history-substring-search/external/objects/f5/c164d4c3af1f5bd068ee10f88b4c7b3a1fd841 b/.zprezto/_.git/modules/modules/history-substring-search/external/objects/f5/c164d4c3af1f5bd068ee10f88b4c7b3a1fd841 new file mode 100644 index 0000000..d25d004 Binary files /dev/null and b/.zprezto/_.git/modules/modules/history-substring-search/external/objects/f5/c164d4c3af1f5bd068ee10f88b4c7b3a1fd841 differ diff --git a/.zprezto/_.git/modules/modules/history-substring-search/external/objects/pack/pack-9463b4e01987f611b341b0fe355a6ba727fbcc86.idx b/.zprezto/_.git/modules/modules/history-substring-search/external/objects/pack/pack-9463b4e01987f611b341b0fe355a6ba727fbcc86.idx new file mode 100644 index 0000000..23ce0d1 Binary files /dev/null and b/.zprezto/_.git/modules/modules/history-substring-search/external/objects/pack/pack-9463b4e01987f611b341b0fe355a6ba727fbcc86.idx differ diff --git a/.zprezto/_.git/modules/modules/history-substring-search/external/objects/pack/pack-9463b4e01987f611b341b0fe355a6ba727fbcc86.pack b/.zprezto/_.git/modules/modules/history-substring-search/external/objects/pack/pack-9463b4e01987f611b341b0fe355a6ba727fbcc86.pack new file mode 100644 index 0000000..82c99ef Binary files /dev/null and b/.zprezto/_.git/modules/modules/history-substring-search/external/objects/pack/pack-9463b4e01987f611b341b0fe355a6ba727fbcc86.pack differ diff --git a/.zprezto/_.git/modules/modules/history-substring-search/external/packed-refs b/.zprezto/_.git/modules/modules/history-substring-search/external/packed-refs new file mode 100644 index 0000000..365d571 --- /dev/null +++ b/.zprezto/_.git/modules/modules/history-substring-search/external/packed-refs @@ -0,0 +1,3 @@ +# pack-refs with: peeled fully-peeled +2c295432175990c1bb4e90bc13f609daa67a25d6 refs/remotes/origin/master +1e7680405239a835aa403a7457cad23750f98e72 refs/tags/v1.0.0 diff --git a/.zprezto/_.git/modules/modules/history-substring-search/external/refs/heads/master b/.zprezto/_.git/modules/modules/history-substring-search/external/refs/heads/master new file mode 100644 index 0000000..45b36d8 --- /dev/null +++ b/.zprezto/_.git/modules/modules/history-substring-search/external/refs/heads/master @@ -0,0 +1 @@ +2c295432175990c1bb4e90bc13f609daa67a25d6 diff --git a/.zprezto/_.git/modules/modules/history-substring-search/external/refs/remotes/origin/HEAD b/.zprezto/_.git/modules/modules/history-substring-search/external/refs/remotes/origin/HEAD new file mode 100644 index 0000000..6efe28f --- /dev/null +++ b/.zprezto/_.git/modules/modules/history-substring-search/external/refs/remotes/origin/HEAD @@ -0,0 +1 @@ +ref: refs/remotes/origin/master diff --git a/.zprezto/_.git/modules/modules/history-substring-search/external/refs/remotes/origin/master b/.zprezto/_.git/modules/modules/history-substring-search/external/refs/remotes/origin/master new file mode 100644 index 0000000..134edd7 --- /dev/null +++ b/.zprezto/_.git/modules/modules/history-substring-search/external/refs/remotes/origin/master @@ -0,0 +1 @@ +f5c164d4c3af1f5bd068ee10f88b4c7b3a1fd841 diff --git a/.zprezto/_.git/modules/modules/prompt/external/agnoster/HEAD b/.zprezto/_.git/modules/modules/prompt/external/agnoster/HEAD new file mode 100644 index 0000000..7d79eae --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/external/agnoster/HEAD @@ -0,0 +1 @@ +43cb371f361eecf62e9dac7afc73a1c16edf89c7 diff --git a/.zprezto/_.git/modules/modules/prompt/external/agnoster/config b/.zprezto/_.git/modules/modules/prompt/external/agnoster/config new file mode 100755 index 0000000..fcf52b9 --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/external/agnoster/config @@ -0,0 +1,14 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + worktree = ../../../../../../modules/prompt/external/agnoster + ignorecase = true + precomposeunicode = true +[remote "origin"] + url = https://gist.github.com/3712874.git + fetch = +refs/heads/*:refs/remotes/origin/* +[branch "master"] + remote = origin + merge = refs/heads/master diff --git a/.zprezto/_.git/modules/modules/prompt/external/agnoster/description b/.zprezto/_.git/modules/modules/prompt/external/agnoster/description new file mode 100644 index 0000000..498b267 --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/external/agnoster/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/.zprezto/_.git/modules/modules/prompt/external/agnoster/hooks/applypatch-msg.sample b/.zprezto/_.git/modules/modules/prompt/external/agnoster/hooks/applypatch-msg.sample new file mode 100755 index 0000000..8b2a2fe --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/external/agnoster/hooks/applypatch-msg.sample @@ -0,0 +1,15 @@ +#!/bin/sh +# +# An example hook script to check the commit log message taken by +# applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. The hook is +# allowed to edit the commit message file. +# +# To enable this hook, rename this file to "applypatch-msg". + +. git-sh-setup +test -x "$GIT_DIR/hooks/commit-msg" && + exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"} +: diff --git a/.zprezto/_.git/modules/modules/prompt/external/agnoster/hooks/commit-msg.sample b/.zprezto/_.git/modules/modules/prompt/external/agnoster/hooks/commit-msg.sample new file mode 100755 index 0000000..b58d118 --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/external/agnoster/hooks/commit-msg.sample @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to check the commit log message. +# Called by "git commit" with one argument, the name of the file +# that has the commit message. The hook should exit with non-zero +# status after issuing an appropriate message if it wants to stop the +# commit. The hook is allowed to edit the commit message file. +# +# To enable this hook, rename this file to "commit-msg". + +# Uncomment the below to add a Signed-off-by line to the message. +# Doing this in a hook is a bad idea in general, but the prepare-commit-msg +# hook is more suited to it. +# +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" + +# This example catches duplicate Signed-off-by lines. + +test "" = "$(grep '^Signed-off-by: ' "$1" | + sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { + echo >&2 Duplicate Signed-off-by lines. + exit 1 +} diff --git a/.zprezto/_.git/modules/modules/prompt/external/agnoster/hooks/post-update.sample b/.zprezto/_.git/modules/modules/prompt/external/agnoster/hooks/post-update.sample new file mode 100755 index 0000000..ec17ec1 --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/external/agnoster/hooks/post-update.sample @@ -0,0 +1,8 @@ +#!/bin/sh +# +# An example hook script to prepare a packed repository for use over +# dumb transports. +# +# To enable this hook, rename this file to "post-update". + +exec git update-server-info diff --git a/.zprezto/_.git/modules/modules/prompt/external/agnoster/hooks/pre-applypatch.sample b/.zprezto/_.git/modules/modules/prompt/external/agnoster/hooks/pre-applypatch.sample new file mode 100755 index 0000000..b1f187c --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/external/agnoster/hooks/pre-applypatch.sample @@ -0,0 +1,14 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed +# by applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-applypatch". + +. git-sh-setup +test -x "$GIT_DIR/hooks/pre-commit" && + exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"} +: diff --git a/.zprezto/_.git/modules/modules/prompt/external/agnoster/hooks/pre-commit.sample b/.zprezto/_.git/modules/modules/prompt/external/agnoster/hooks/pre-commit.sample new file mode 100755 index 0000000..68d62d5 --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/external/agnoster/hooks/pre-commit.sample @@ -0,0 +1,49 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git commit" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message if +# it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-commit". + +if git rev-parse --verify HEAD >/dev/null 2>&1 +then + against=HEAD +else + # Initial commit: diff against an empty tree object + against=4b825dc642cb6eb9a060e54bf8d69288fbee4904 +fi + +# If you want to allow non-ASCII filenames set this variable to true. +allownonascii=$(git config --bool hooks.allownonascii) + +# Redirect output to stderr. +exec 1>&2 + +# Cross platform projects tend to avoid non-ASCII filenames; prevent +# them from being added to the repository. We exploit the fact that the +# printable range starts at the space character and ends with tilde. +if [ "$allownonascii" != "true" ] && + # Note that the use of brackets around a tr range is ok here, (it's + # even required, for portability to Solaris 10's /usr/bin/tr), since + # the square bracket bytes happen to fall in the designated range. + test $(git diff --cached --name-only --diff-filter=A -z $against | + LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 +then + cat <<\EOF +Error: Attempt to add a non-ASCII file name. + +This can cause problems if you want to work with people on other platforms. + +To be portable it is advisable to rename the file. + +If you know what you are doing you can disable this check using: + + git config hooks.allownonascii true +EOF + exit 1 +fi + +# If there are whitespace errors, print the offending file names and fail. +exec git diff-index --check --cached $against -- diff --git a/.zprezto/_.git/modules/modules/prompt/external/agnoster/hooks/pre-push.sample b/.zprezto/_.git/modules/modules/prompt/external/agnoster/hooks/pre-push.sample new file mode 100755 index 0000000..69e3c67 --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/external/agnoster/hooks/pre-push.sample @@ -0,0 +1,54 @@ +#!/bin/sh + +# An example hook script to verify what is about to be pushed. Called by "git +# push" after it has checked the remote status, but before anything has been +# pushed. If this script exits with a non-zero status nothing will be pushed. +# +# This hook is called with the following parameters: +# +# $1 -- Name of the remote to which the push is being done +# $2 -- URL to which the push is being done +# +# If pushing without using a named remote those arguments will be equal. +# +# Information about the commits which are being pushed is supplied as lines to +# the standard input in the form: +# +# +# +# This sample shows how to prevent push of commits where the log message starts +# with "WIP" (work in progress). + +remote="$1" +url="$2" + +z40=0000000000000000000000000000000000000000 + +IFS=' ' +while read local_ref local_sha remote_ref remote_sha +do + if [ "$local_sha" = $z40 ] + then + # Handle delete + : + else + if [ "$remote_sha" = $z40 ] + then + # New branch, examine all commits + range="$local_sha" + else + # Update to existing branch, examine new commits + range="$remote_sha..$local_sha" + fi + + # Check for WIP commit + commit=`git rev-list -n 1 --grep '^WIP' "$range"` + if [ -n "$commit" ] + then + echo >&2 "Found WIP commit in $local_ref, not pushing" + exit 1 + fi + fi +done + +exit 0 diff --git a/.zprezto/_.git/modules/modules/prompt/external/agnoster/hooks/pre-rebase.sample b/.zprezto/_.git/modules/modules/prompt/external/agnoster/hooks/pre-rebase.sample new file mode 100755 index 0000000..9773ed4 --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/external/agnoster/hooks/pre-rebase.sample @@ -0,0 +1,169 @@ +#!/bin/sh +# +# Copyright (c) 2006, 2008 Junio C Hamano +# +# The "pre-rebase" hook is run just before "git rebase" starts doing +# its job, and can prevent the command from running by exiting with +# non-zero status. +# +# The hook is called with the following parameters: +# +# $1 -- the upstream the series was forked from. +# $2 -- the branch being rebased (or empty when rebasing the current branch). +# +# This sample shows how to prevent topic branches that are already +# merged to 'next' branch from getting rebased, because allowing it +# would result in rebasing already published history. + +publish=next +basebranch="$1" +if test "$#" = 2 +then + topic="refs/heads/$2" +else + topic=`git symbolic-ref HEAD` || + exit 0 ;# we do not interrupt rebasing detached HEAD +fi + +case "$topic" in +refs/heads/??/*) + ;; +*) + exit 0 ;# we do not interrupt others. + ;; +esac + +# Now we are dealing with a topic branch being rebased +# on top of master. Is it OK to rebase it? + +# Does the topic really exist? +git show-ref -q "$topic" || { + echo >&2 "No such branch $topic" + exit 1 +} + +# Is topic fully merged to master? +not_in_master=`git rev-list --pretty=oneline ^master "$topic"` +if test -z "$not_in_master" +then + echo >&2 "$topic is fully merged to master; better remove it." + exit 1 ;# we could allow it, but there is no point. +fi + +# Is topic ever merged to next? If so you should not be rebasing it. +only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` +only_next_2=`git rev-list ^master ${publish} | sort` +if test "$only_next_1" = "$only_next_2" +then + not_in_topic=`git rev-list "^$topic" master` + if test -z "$not_in_topic" + then + echo >&2 "$topic is already up-to-date with master" + exit 1 ;# we could allow it, but there is no point. + else + exit 0 + fi +else + not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` + /usr/bin/perl -e ' + my $topic = $ARGV[0]; + my $msg = "* $topic has commits already merged to public branch:\n"; + my (%not_in_next) = map { + /^([0-9a-f]+) /; + ($1 => 1); + } split(/\n/, $ARGV[1]); + for my $elem (map { + /^([0-9a-f]+) (.*)$/; + [$1 => $2]; + } split(/\n/, $ARGV[2])) { + if (!exists $not_in_next{$elem->[0]}) { + if ($msg) { + print STDERR $msg; + undef $msg; + } + print STDERR " $elem->[1]\n"; + } + } + ' "$topic" "$not_in_next" "$not_in_master" + exit 1 +fi + +exit 0 + +################################################################ + +This sample hook safeguards topic branches that have been +published from being rewound. + +The workflow assumed here is: + + * Once a topic branch forks from "master", "master" is never + merged into it again (either directly or indirectly). + + * Once a topic branch is fully cooked and merged into "master", + it is deleted. If you need to build on top of it to correct + earlier mistakes, a new topic branch is created by forking at + the tip of the "master". This is not strictly necessary, but + it makes it easier to keep your history simple. + + * Whenever you need to test or publish your changes to topic + branches, merge them into "next" branch. + +The script, being an example, hardcodes the publish branch name +to be "next", but it is trivial to make it configurable via +$GIT_DIR/config mechanism. + +With this workflow, you would want to know: + +(1) ... if a topic branch has ever been merged to "next". Young + topic branches can have stupid mistakes you would rather + clean up before publishing, and things that have not been + merged into other branches can be easily rebased without + affecting other people. But once it is published, you would + not want to rewind it. + +(2) ... if a topic branch has been fully merged to "master". + Then you can delete it. More importantly, you should not + build on top of it -- other people may already want to + change things related to the topic as patches against your + "master", so if you need further changes, it is better to + fork the topic (perhaps with the same name) afresh from the + tip of "master". + +Let's look at this example: + + o---o---o---o---o---o---o---o---o---o "next" + / / / / + / a---a---b A / / + / / / / + / / c---c---c---c B / + / / / \ / + / / / b---b C \ / + / / / / \ / + ---o---o---o---o---o---o---o---o---o---o---o "master" + + +A, B and C are topic branches. + + * A has one fix since it was merged up to "next". + + * B has finished. It has been fully merged up to "master" and "next", + and is ready to be deleted. + + * C has not merged to "next" at all. + +We would want to allow C to be rebased, refuse A, and encourage +B to be deleted. + +To compute (1): + + git rev-list ^master ^topic next + git rev-list ^master next + + if these match, topic has not merged in next at all. + +To compute (2): + + git rev-list master..topic + + if this is empty, it is fully merged to "master". diff --git a/.zprezto/_.git/modules/modules/prompt/external/agnoster/hooks/prepare-commit-msg.sample b/.zprezto/_.git/modules/modules/prompt/external/agnoster/hooks/prepare-commit-msg.sample new file mode 100755 index 0000000..f093a02 --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/external/agnoster/hooks/prepare-commit-msg.sample @@ -0,0 +1,36 @@ +#!/bin/sh +# +# An example hook script to prepare the commit log message. +# Called by "git commit" with the name of the file that has the +# commit message, followed by the description of the commit +# message's source. The hook's purpose is to edit the commit +# message file. If the hook fails with a non-zero status, +# the commit is aborted. +# +# To enable this hook, rename this file to "prepare-commit-msg". + +# This hook includes three examples. The first comments out the +# "Conflicts:" part of a merge commit. +# +# The second includes the output of "git diff --name-status -r" +# into the message, just before the "git status" output. It is +# commented because it doesn't cope with --amend or with squashed +# commits. +# +# The third example adds a Signed-off-by line to the message, that can +# still be edited. This is rarely a good idea. + +case "$2,$3" in + merge,) + /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;; + +# ,|template,) +# /usr/bin/perl -i.bak -pe ' +# print "\n" . `git diff --cached --name-status -r` +# if /^#/ && $first++ == 0' "$1" ;; + + *) ;; +esac + +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" diff --git a/.zprezto/_.git/modules/modules/prompt/external/agnoster/hooks/update.sample b/.zprezto/_.git/modules/modules/prompt/external/agnoster/hooks/update.sample new file mode 100755 index 0000000..d847583 --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/external/agnoster/hooks/update.sample @@ -0,0 +1,128 @@ +#!/bin/sh +# +# An example hook script to blocks unannotated tags from entering. +# Called by "git receive-pack" with arguments: refname sha1-old sha1-new +# +# To enable this hook, rename this file to "update". +# +# Config +# ------ +# hooks.allowunannotated +# This boolean sets whether unannotated tags will be allowed into the +# repository. By default they won't be. +# hooks.allowdeletetag +# This boolean sets whether deleting tags will be allowed in the +# repository. By default they won't be. +# hooks.allowmodifytag +# This boolean sets whether a tag may be modified after creation. By default +# it won't be. +# hooks.allowdeletebranch +# This boolean sets whether deleting branches will be allowed in the +# repository. By default they won't be. +# hooks.denycreatebranch +# This boolean sets whether remotely creating branches will be denied +# in the repository. By default this is allowed. +# + +# --- Command line +refname="$1" +oldrev="$2" +newrev="$3" + +# --- Safety check +if [ -z "$GIT_DIR" ]; then + echo "Don't run this script from the command line." >&2 + echo " (if you want, you could supply GIT_DIR then run" >&2 + echo " $0 )" >&2 + exit 1 +fi + +if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then + echo "usage: $0 " >&2 + exit 1 +fi + +# --- Config +allowunannotated=$(git config --bool hooks.allowunannotated) +allowdeletebranch=$(git config --bool hooks.allowdeletebranch) +denycreatebranch=$(git config --bool hooks.denycreatebranch) +allowdeletetag=$(git config --bool hooks.allowdeletetag) +allowmodifytag=$(git config --bool hooks.allowmodifytag) + +# check for no description +projectdesc=$(sed -e '1q' "$GIT_DIR/description") +case "$projectdesc" in +"Unnamed repository"* | "") + echo "*** Project description file hasn't been set" >&2 + exit 1 + ;; +esac + +# --- Check types +# if $newrev is 0000...0000, it's a commit to delete a ref. +zero="0000000000000000000000000000000000000000" +if [ "$newrev" = "$zero" ]; then + newrev_type=delete +else + newrev_type=$(git cat-file -t $newrev) +fi + +case "$refname","$newrev_type" in + refs/tags/*,commit) + # un-annotated tag + short_refname=${refname##refs/tags/} + if [ "$allowunannotated" != "true" ]; then + echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2 + echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 + exit 1 + fi + ;; + refs/tags/*,delete) + # delete tag + if [ "$allowdeletetag" != "true" ]; then + echo "*** Deleting a tag is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/tags/*,tag) + # annotated tag + if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 + then + echo "*** Tag '$refname' already exists." >&2 + echo "*** Modifying a tag is not allowed in this repository." >&2 + exit 1 + fi + ;; + refs/heads/*,commit) + # branch + if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then + echo "*** Creating a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/heads/*,delete) + # delete branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/remotes/*,commit) + # tracking branch + ;; + refs/remotes/*,delete) + # delete tracking branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a tracking branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + *) + # Anything else (is there anything else?) + echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 + exit 1 + ;; +esac + +# --- Finished +exit 0 diff --git a/.zprezto/_.git/modules/modules/prompt/external/agnoster/index b/.zprezto/_.git/modules/modules/prompt/external/agnoster/index new file mode 100644 index 0000000..91d1956 Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/external/agnoster/index differ diff --git a/.zprezto/_.git/modules/modules/prompt/external/agnoster/info/exclude b/.zprezto/_.git/modules/modules/prompt/external/agnoster/info/exclude new file mode 100644 index 0000000..a5196d1 --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/external/agnoster/info/exclude @@ -0,0 +1,6 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ diff --git a/.zprezto/_.git/modules/modules/prompt/external/agnoster/logs/HEAD b/.zprezto/_.git/modules/modules/prompt/external/agnoster/logs/HEAD new file mode 100644 index 0000000..9c10ecc --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/external/agnoster/logs/HEAD @@ -0,0 +1,2 @@ +0000000000000000000000000000000000000000 43cb371f361eecf62e9dac7afc73a1c16edf89c7 Abra 1443994573 +0400 clone: from https://gist.github.com/3712874.git +43cb371f361eecf62e9dac7afc73a1c16edf89c7 43cb371f361eecf62e9dac7afc73a1c16edf89c7 Abra 1443994573 +0400 checkout: moving from master to 43cb371f361eecf62e9dac7afc73a1c16edf89c7 diff --git a/.zprezto/_.git/modules/modules/prompt/external/agnoster/logs/refs/heads/master b/.zprezto/_.git/modules/modules/prompt/external/agnoster/logs/refs/heads/master new file mode 100644 index 0000000..64d20d6 --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/external/agnoster/logs/refs/heads/master @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 43cb371f361eecf62e9dac7afc73a1c16edf89c7 Abra 1443994573 +0400 clone: from https://gist.github.com/3712874.git diff --git a/.zprezto/_.git/modules/modules/prompt/external/agnoster/logs/refs/remotes/origin/HEAD b/.zprezto/_.git/modules/modules/prompt/external/agnoster/logs/refs/remotes/origin/HEAD new file mode 100644 index 0000000..64d20d6 --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/external/agnoster/logs/refs/remotes/origin/HEAD @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 43cb371f361eecf62e9dac7afc73a1c16edf89c7 Abra 1443994573 +0400 clone: from https://gist.github.com/3712874.git diff --git a/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/07/6b60b49a451844c269a03f04c9573434774284 b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/07/6b60b49a451844c269a03f04c9573434774284 new file mode 100644 index 0000000..7550651 Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/07/6b60b49a451844c269a03f04c9573434774284 differ diff --git a/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/1a/d50fb48edd750f2d0a6e7b224adc59b2796383 b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/1a/d50fb48edd750f2d0a6e7b224adc59b2796383 new file mode 100644 index 0000000..54996d1 Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/1a/d50fb48edd750f2d0a6e7b224adc59b2796383 differ diff --git a/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/22/bb0cb709b54cfa3b17827d79238c34386b5cc2 b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/22/bb0cb709b54cfa3b17827d79238c34386b5cc2 new file mode 100644 index 0000000..8bda6a2 Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/22/bb0cb709b54cfa3b17827d79238c34386b5cc2 differ diff --git a/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/31/4691c41c200dfb71841c2b3969c253a6e77d2f b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/31/4691c41c200dfb71841c2b3969c253a6e77d2f new file mode 100644 index 0000000..2dd7515 Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/31/4691c41c200dfb71841c2b3969c253a6e77d2f differ diff --git a/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/33/58b1fc98b0d29de1ba3066351e4b3d3b0ac027 b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/33/58b1fc98b0d29de1ba3066351e4b3d3b0ac027 new file mode 100644 index 0000000..7fc83d9 Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/33/58b1fc98b0d29de1ba3066351e4b3d3b0ac027 differ diff --git a/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/36/f8f55e71aa4dcd5d668a7061330d88a4a02fc4 b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/36/f8f55e71aa4dcd5d668a7061330d88a4a02fc4 new file mode 100644 index 0000000..3f2337b --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/36/f8f55e71aa4dcd5d668a7061330d88a4a02fc4 @@ -0,0 +1,2 @@ +xKn0 D)x((&6[rfn۶*Lߴ@HHKX̝ +H5B.2Ri1Md2Хu:~W_I׽*~K>pZϗ{%ߘ_ &Si \ No newline at end of file diff --git a/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/37/b4f00a5be9b61a79e144d659cc6b39189589a9 b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/37/b4f00a5be9b61a79e144d659cc6b39189589a9 new file mode 100644 index 0000000..e8820eb --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/37/b4f00a5be9b61a79e144d659cc6b39189589a9 @@ -0,0 +1,3 @@ +xJ1ayt A +"d2KɎ烟:)q.`@9 "uT3Kc2 JL.B*X.)͑} m#&WyC_zn+[/WmJ@*v;`LAhӛUxx?@O,w|#("PE08wNNmb4<ӑ+J8O2 +!7L(=1 `}O +荕؄J;￠aD|!ЄD @y)~ġcj,Pr*,+fGڀ%.XNXϦ(2q|Y!n oNwQopWW@Rw[qbnKnY"V|qŮ?3%bu9lf}]1힎C=dBS@jo@̦_3+i:xqXQ6%𩈠I̲f$XKLI +i}biUCv}̶%*h \ No newline at end of file diff --git a/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/9d/5e1cd98c1b8c3f66dbb31eea78092d21e80223 b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/9d/5e1cd98c1b8c3f66dbb31eea78092d21e80223 new file mode 100644 index 0000000..cbea9cd Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/9d/5e1cd98c1b8c3f66dbb31eea78092d21e80223 differ diff --git a/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/9e/c9c8f7d3c48e3f8c97d2e5a3b1867b21e72efc b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/9e/c9c8f7d3c48e3f8c97d2e5a3b1867b21e72efc new file mode 100644 index 0000000..1084d78 Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/9e/c9c8f7d3c48e3f8c97d2e5a3b1867b21e72efc differ diff --git a/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/a0/1d483f88b0105004f82b0e0ec100264a9a4cc1 b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/a0/1d483f88b0105004f82b0e0ec100264a9a4cc1 new file mode 100644 index 0000000..57b0161 --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/a0/1d483f88b0105004f82b0e0ec100264a9a4cc1 @@ -0,0 +1,3 @@ +xj1E]+Vn hf^V,T8xϻT!b%:R`(" +'5]:hP+1@~b_09,s%b/mkmnK]o3:k ?}sy +uS#:+ O \ No newline at end of file diff --git a/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/a4/5667e4dbf7a849cf22bb6c94853ad9d673d080 b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/a4/5667e4dbf7a849cf22bb6c94853ad9d673d080 new file mode 100644 index 0000000..602da1b Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/a4/5667e4dbf7a849cf22bb6c94853ad9d673d080 differ diff --git a/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/b1/85bef3158bc4b55822c67c479a8824daf4ecfd b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/b1/85bef3158bc4b55822c67c479a8824daf4ecfd new file mode 100644 index 0000000..a874b1c Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/b1/85bef3158bc4b55822c67c479a8824daf4ecfd differ diff --git a/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/b3/68a319e05486d69fd11796f956d8b401e4dfb2 b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/b3/68a319e05486d69fd11796f956d8b401e4dfb2 new file mode 100644 index 0000000..ee388b0 Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/b3/68a319e05486d69fd11796f956d8b401e4dfb2 differ diff --git a/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/b3/7a325b9b96a7f15dd724cb04acce3645f7a289 b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/b3/7a325b9b96a7f15dd724cb04acce3645f7a289 new file mode 100644 index 0000000..d2a10cd Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/b3/7a325b9b96a7f15dd724cb04acce3645f7a289 differ diff --git a/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/b4/913c9bc4983b03e349372aa51f6e2575a94783 b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/b4/913c9bc4983b03e349372aa51f6e2575a94783 new file mode 100644 index 0000000..044e8f3 --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/b4/913c9bc4983b03e349372aa51f6e2575a94783 @@ -0,0 +1 @@ +x 0 @QΝ" l'] !LI J F73'JO>!PIBc6bd~xi;=MZ&-1G#%(@:ksM5k}>mbֺukɡ w#Ey \ No newline at end of file diff --git a/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/b6/c212c7f7898e6dc20303b2b3b5975213d2510f b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/b6/c212c7f7898e6dc20303b2b3b5975213d2510f new file mode 100644 index 0000000..af8c387 Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/b6/c212c7f7898e6dc20303b2b3b5975213d2510f differ diff --git a/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/c3/107c06c04fb42b0ca27b0a81b15854819969c6 b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/c3/107c06c04fb42b0ca27b0a81b15854819969c6 new file mode 100644 index 0000000..13cc56e Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/c3/107c06c04fb42b0ca27b0a81b15854819969c6 differ diff --git a/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/d0/9b10eb70b4e0ee203260e8f56151f152311abc b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/d0/9b10eb70b4e0ee203260e8f56151f152311abc new file mode 100644 index 0000000..f52a239 Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/d0/9b10eb70b4e0ee203260e8f56151f152311abc differ diff --git a/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/d3/8db2157b0fa3419636494ab383dde949498b50 b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/d3/8db2157b0fa3419636494ab383dde949498b50 new file mode 100644 index 0000000..f160ade Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/d3/8db2157b0fa3419636494ab383dde949498b50 differ diff --git a/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/de/4828056ec1f04b03dbf4940f1b61e525ec9799 b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/de/4828056ec1f04b03dbf4940f1b61e525ec9799 new file mode 100644 index 0000000..ff18603 Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/de/4828056ec1f04b03dbf4940f1b61e525ec9799 differ diff --git a/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/e0/dda1072741235e4f0d8f54a1d97f17b6f61f8c b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/e0/dda1072741235e4f0d8f54a1d97f17b6f61f8c new file mode 100644 index 0000000..b361b8e Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/e0/dda1072741235e4f0d8f54a1d97f17b6f61f8c differ diff --git a/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/e5/e0d66885db05a4fc4b963857bc19302e3ecd64 b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/e5/e0d66885db05a4fc4b963857bc19302e3ecd64 new file mode 100644 index 0000000..eb9e15d Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/e5/e0d66885db05a4fc4b963857bc19302e3ecd64 differ diff --git a/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/e8/adb46f5f99339c7c62eb2a5b2583fcece8d08c b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/e8/adb46f5f99339c7c62eb2a5b2583fcece8d08c new file mode 100644 index 0000000..f8b7687 Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/e8/adb46f5f99339c7c62eb2a5b2583fcece8d08c differ diff --git a/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/e8/f0fe7ff0bfb52705b1bc42f236cc759325bd64 b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/e8/f0fe7ff0bfb52705b1bc42f236cc759325bd64 new file mode 100644 index 0000000..c99e3b1 Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/e8/f0fe7ff0bfb52705b1bc42f236cc759325bd64 differ diff --git a/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/ec/30014d9095976071287d03e819c1a5897015af b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/ec/30014d9095976071287d03e819c1a5897015af new file mode 100644 index 0000000..01a2b63 Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/ec/30014d9095976071287d03e819c1a5897015af differ diff --git a/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/ed/99c88f49137e45c4fd4d631bb0d25e3a77d9a4 b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/ed/99c88f49137e45c4fd4d631bb0d25e3a77d9a4 new file mode 100644 index 0000000..d03faeb Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/ed/99c88f49137e45c4fd4d631bb0d25e3a77d9a4 differ diff --git a/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/ef/9da422ce30cdf177642e8ddd63681f40ddb8f5 b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/ef/9da422ce30cdf177642e8ddd63681f40ddb8f5 new file mode 100644 index 0000000..fab2d3a Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/ef/9da422ce30cdf177642e8ddd63681f40ddb8f5 differ diff --git a/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/f2/dca9212d61c3da86a38a74fb39f240e0b1a779 b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/f2/dca9212d61c3da86a38a74fb39f240e0b1a779 new file mode 100644 index 0000000..1690886 Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/f2/dca9212d61c3da86a38a74fb39f240e0b1a779 differ diff --git a/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/f4/5ade34d581e6fa88fc8fcbe6f2f3fbe3c23ddf b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/f4/5ade34d581e6fa88fc8fcbe6f2f3fbe3c23ddf new file mode 100644 index 0000000..5cb6a54 Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/f4/5ade34d581e6fa88fc8fcbe6f2f3fbe3c23ddf differ diff --git a/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/f9/6ea53a6b1a1fabcc724fb17ae27aa9605ec29e b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/f9/6ea53a6b1a1fabcc724fb17ae27aa9605ec29e new file mode 100644 index 0000000..21f8e2a Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/f9/6ea53a6b1a1fabcc724fb17ae27aa9605ec29e differ diff --git a/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/fe/1b065c7f6a7c7046ff05b9cb2c3f9d50311b45 b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/fe/1b065c7f6a7c7046ff05b9cb2c3f9d50311b45 new file mode 100644 index 0000000..8b18987 Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/external/agnoster/objects/fe/1b065c7f6a7c7046ff05b9cb2c3f9d50311b45 differ diff --git a/.zprezto/_.git/modules/modules/prompt/external/agnoster/packed-refs b/.zprezto/_.git/modules/modules/prompt/external/agnoster/packed-refs new file mode 100644 index 0000000..e3b24d6 --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/external/agnoster/packed-refs @@ -0,0 +1,2 @@ +# pack-refs with: peeled fully-peeled +43cb371f361eecf62e9dac7afc73a1c16edf89c7 refs/remotes/origin/master diff --git a/.zprezto/_.git/modules/modules/prompt/external/agnoster/refs/heads/master b/.zprezto/_.git/modules/modules/prompt/external/agnoster/refs/heads/master new file mode 100644 index 0000000..7d79eae --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/external/agnoster/refs/heads/master @@ -0,0 +1 @@ +43cb371f361eecf62e9dac7afc73a1c16edf89c7 diff --git a/.zprezto/_.git/modules/modules/prompt/external/agnoster/refs/remotes/origin/HEAD b/.zprezto/_.git/modules/modules/prompt/external/agnoster/refs/remotes/origin/HEAD new file mode 100644 index 0000000..6efe28f --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/external/agnoster/refs/remotes/origin/HEAD @@ -0,0 +1 @@ +ref: refs/remotes/origin/master diff --git a/.zprezto/_.git/modules/modules/prompt/external/powerline/HEAD b/.zprezto/_.git/modules/modules/prompt/external/powerline/HEAD new file mode 100644 index 0000000..17d5321 --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/external/powerline/HEAD @@ -0,0 +1 @@ +8e81152340c4beb2d941340d1feb2dc29bbcc309 diff --git a/.zprezto/_.git/modules/modules/prompt/external/powerline/config b/.zprezto/_.git/modules/modules/prompt/external/powerline/config new file mode 100755 index 0000000..803cacf --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/external/powerline/config @@ -0,0 +1,14 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + worktree = ../../../../../../modules/prompt/external/powerline + ignorecase = true + precomposeunicode = true +[remote "origin"] + url = https://github.com/davidjrice/prezto_powerline.git + fetch = +refs/heads/*:refs/remotes/origin/* +[branch "master"] + remote = origin + merge = refs/heads/master diff --git a/.zprezto/_.git/modules/modules/prompt/external/powerline/description b/.zprezto/_.git/modules/modules/prompt/external/powerline/description new file mode 100644 index 0000000..498b267 --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/external/powerline/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/.zprezto/_.git/modules/modules/prompt/external/powerline/hooks/applypatch-msg.sample b/.zprezto/_.git/modules/modules/prompt/external/powerline/hooks/applypatch-msg.sample new file mode 100755 index 0000000..8b2a2fe --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/external/powerline/hooks/applypatch-msg.sample @@ -0,0 +1,15 @@ +#!/bin/sh +# +# An example hook script to check the commit log message taken by +# applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. The hook is +# allowed to edit the commit message file. +# +# To enable this hook, rename this file to "applypatch-msg". + +. git-sh-setup +test -x "$GIT_DIR/hooks/commit-msg" && + exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"} +: diff --git a/.zprezto/_.git/modules/modules/prompt/external/powerline/hooks/commit-msg.sample b/.zprezto/_.git/modules/modules/prompt/external/powerline/hooks/commit-msg.sample new file mode 100755 index 0000000..b58d118 --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/external/powerline/hooks/commit-msg.sample @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to check the commit log message. +# Called by "git commit" with one argument, the name of the file +# that has the commit message. The hook should exit with non-zero +# status after issuing an appropriate message if it wants to stop the +# commit. The hook is allowed to edit the commit message file. +# +# To enable this hook, rename this file to "commit-msg". + +# Uncomment the below to add a Signed-off-by line to the message. +# Doing this in a hook is a bad idea in general, but the prepare-commit-msg +# hook is more suited to it. +# +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" + +# This example catches duplicate Signed-off-by lines. + +test "" = "$(grep '^Signed-off-by: ' "$1" | + sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { + echo >&2 Duplicate Signed-off-by lines. + exit 1 +} diff --git a/.zprezto/_.git/modules/modules/prompt/external/powerline/hooks/post-update.sample b/.zprezto/_.git/modules/modules/prompt/external/powerline/hooks/post-update.sample new file mode 100755 index 0000000..ec17ec1 --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/external/powerline/hooks/post-update.sample @@ -0,0 +1,8 @@ +#!/bin/sh +# +# An example hook script to prepare a packed repository for use over +# dumb transports. +# +# To enable this hook, rename this file to "post-update". + +exec git update-server-info diff --git a/.zprezto/_.git/modules/modules/prompt/external/powerline/hooks/pre-applypatch.sample b/.zprezto/_.git/modules/modules/prompt/external/powerline/hooks/pre-applypatch.sample new file mode 100755 index 0000000..b1f187c --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/external/powerline/hooks/pre-applypatch.sample @@ -0,0 +1,14 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed +# by applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-applypatch". + +. git-sh-setup +test -x "$GIT_DIR/hooks/pre-commit" && + exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"} +: diff --git a/.zprezto/_.git/modules/modules/prompt/external/powerline/hooks/pre-commit.sample b/.zprezto/_.git/modules/modules/prompt/external/powerline/hooks/pre-commit.sample new file mode 100755 index 0000000..68d62d5 --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/external/powerline/hooks/pre-commit.sample @@ -0,0 +1,49 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git commit" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message if +# it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-commit". + +if git rev-parse --verify HEAD >/dev/null 2>&1 +then + against=HEAD +else + # Initial commit: diff against an empty tree object + against=4b825dc642cb6eb9a060e54bf8d69288fbee4904 +fi + +# If you want to allow non-ASCII filenames set this variable to true. +allownonascii=$(git config --bool hooks.allownonascii) + +# Redirect output to stderr. +exec 1>&2 + +# Cross platform projects tend to avoid non-ASCII filenames; prevent +# them from being added to the repository. We exploit the fact that the +# printable range starts at the space character and ends with tilde. +if [ "$allownonascii" != "true" ] && + # Note that the use of brackets around a tr range is ok here, (it's + # even required, for portability to Solaris 10's /usr/bin/tr), since + # the square bracket bytes happen to fall in the designated range. + test $(git diff --cached --name-only --diff-filter=A -z $against | + LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 +then + cat <<\EOF +Error: Attempt to add a non-ASCII file name. + +This can cause problems if you want to work with people on other platforms. + +To be portable it is advisable to rename the file. + +If you know what you are doing you can disable this check using: + + git config hooks.allownonascii true +EOF + exit 1 +fi + +# If there are whitespace errors, print the offending file names and fail. +exec git diff-index --check --cached $against -- diff --git a/.zprezto/_.git/modules/modules/prompt/external/powerline/hooks/pre-push.sample b/.zprezto/_.git/modules/modules/prompt/external/powerline/hooks/pre-push.sample new file mode 100755 index 0000000..69e3c67 --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/external/powerline/hooks/pre-push.sample @@ -0,0 +1,54 @@ +#!/bin/sh + +# An example hook script to verify what is about to be pushed. Called by "git +# push" after it has checked the remote status, but before anything has been +# pushed. If this script exits with a non-zero status nothing will be pushed. +# +# This hook is called with the following parameters: +# +# $1 -- Name of the remote to which the push is being done +# $2 -- URL to which the push is being done +# +# If pushing without using a named remote those arguments will be equal. +# +# Information about the commits which are being pushed is supplied as lines to +# the standard input in the form: +# +# +# +# This sample shows how to prevent push of commits where the log message starts +# with "WIP" (work in progress). + +remote="$1" +url="$2" + +z40=0000000000000000000000000000000000000000 + +IFS=' ' +while read local_ref local_sha remote_ref remote_sha +do + if [ "$local_sha" = $z40 ] + then + # Handle delete + : + else + if [ "$remote_sha" = $z40 ] + then + # New branch, examine all commits + range="$local_sha" + else + # Update to existing branch, examine new commits + range="$remote_sha..$local_sha" + fi + + # Check for WIP commit + commit=`git rev-list -n 1 --grep '^WIP' "$range"` + if [ -n "$commit" ] + then + echo >&2 "Found WIP commit in $local_ref, not pushing" + exit 1 + fi + fi +done + +exit 0 diff --git a/.zprezto/_.git/modules/modules/prompt/external/powerline/hooks/pre-rebase.sample b/.zprezto/_.git/modules/modules/prompt/external/powerline/hooks/pre-rebase.sample new file mode 100755 index 0000000..9773ed4 --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/external/powerline/hooks/pre-rebase.sample @@ -0,0 +1,169 @@ +#!/bin/sh +# +# Copyright (c) 2006, 2008 Junio C Hamano +# +# The "pre-rebase" hook is run just before "git rebase" starts doing +# its job, and can prevent the command from running by exiting with +# non-zero status. +# +# The hook is called with the following parameters: +# +# $1 -- the upstream the series was forked from. +# $2 -- the branch being rebased (or empty when rebasing the current branch). +# +# This sample shows how to prevent topic branches that are already +# merged to 'next' branch from getting rebased, because allowing it +# would result in rebasing already published history. + +publish=next +basebranch="$1" +if test "$#" = 2 +then + topic="refs/heads/$2" +else + topic=`git symbolic-ref HEAD` || + exit 0 ;# we do not interrupt rebasing detached HEAD +fi + +case "$topic" in +refs/heads/??/*) + ;; +*) + exit 0 ;# we do not interrupt others. + ;; +esac + +# Now we are dealing with a topic branch being rebased +# on top of master. Is it OK to rebase it? + +# Does the topic really exist? +git show-ref -q "$topic" || { + echo >&2 "No such branch $topic" + exit 1 +} + +# Is topic fully merged to master? +not_in_master=`git rev-list --pretty=oneline ^master "$topic"` +if test -z "$not_in_master" +then + echo >&2 "$topic is fully merged to master; better remove it." + exit 1 ;# we could allow it, but there is no point. +fi + +# Is topic ever merged to next? If so you should not be rebasing it. +only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` +only_next_2=`git rev-list ^master ${publish} | sort` +if test "$only_next_1" = "$only_next_2" +then + not_in_topic=`git rev-list "^$topic" master` + if test -z "$not_in_topic" + then + echo >&2 "$topic is already up-to-date with master" + exit 1 ;# we could allow it, but there is no point. + else + exit 0 + fi +else + not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` + /usr/bin/perl -e ' + my $topic = $ARGV[0]; + my $msg = "* $topic has commits already merged to public branch:\n"; + my (%not_in_next) = map { + /^([0-9a-f]+) /; + ($1 => 1); + } split(/\n/, $ARGV[1]); + for my $elem (map { + /^([0-9a-f]+) (.*)$/; + [$1 => $2]; + } split(/\n/, $ARGV[2])) { + if (!exists $not_in_next{$elem->[0]}) { + if ($msg) { + print STDERR $msg; + undef $msg; + } + print STDERR " $elem->[1]\n"; + } + } + ' "$topic" "$not_in_next" "$not_in_master" + exit 1 +fi + +exit 0 + +################################################################ + +This sample hook safeguards topic branches that have been +published from being rewound. + +The workflow assumed here is: + + * Once a topic branch forks from "master", "master" is never + merged into it again (either directly or indirectly). + + * Once a topic branch is fully cooked and merged into "master", + it is deleted. If you need to build on top of it to correct + earlier mistakes, a new topic branch is created by forking at + the tip of the "master". This is not strictly necessary, but + it makes it easier to keep your history simple. + + * Whenever you need to test or publish your changes to topic + branches, merge them into "next" branch. + +The script, being an example, hardcodes the publish branch name +to be "next", but it is trivial to make it configurable via +$GIT_DIR/config mechanism. + +With this workflow, you would want to know: + +(1) ... if a topic branch has ever been merged to "next". Young + topic branches can have stupid mistakes you would rather + clean up before publishing, and things that have not been + merged into other branches can be easily rebased without + affecting other people. But once it is published, you would + not want to rewind it. + +(2) ... if a topic branch has been fully merged to "master". + Then you can delete it. More importantly, you should not + build on top of it -- other people may already want to + change things related to the topic as patches against your + "master", so if you need further changes, it is better to + fork the topic (perhaps with the same name) afresh from the + tip of "master". + +Let's look at this example: + + o---o---o---o---o---o---o---o---o---o "next" + / / / / + / a---a---b A / / + / / / / + / / c---c---c---c B / + / / / \ / + / / / b---b C \ / + / / / / \ / + ---o---o---o---o---o---o---o---o---o---o---o "master" + + +A, B and C are topic branches. + + * A has one fix since it was merged up to "next". + + * B has finished. It has been fully merged up to "master" and "next", + and is ready to be deleted. + + * C has not merged to "next" at all. + +We would want to allow C to be rebased, refuse A, and encourage +B to be deleted. + +To compute (1): + + git rev-list ^master ^topic next + git rev-list ^master next + + if these match, topic has not merged in next at all. + +To compute (2): + + git rev-list master..topic + + if this is empty, it is fully merged to "master". diff --git a/.zprezto/_.git/modules/modules/prompt/external/powerline/hooks/prepare-commit-msg.sample b/.zprezto/_.git/modules/modules/prompt/external/powerline/hooks/prepare-commit-msg.sample new file mode 100755 index 0000000..f093a02 --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/external/powerline/hooks/prepare-commit-msg.sample @@ -0,0 +1,36 @@ +#!/bin/sh +# +# An example hook script to prepare the commit log message. +# Called by "git commit" with the name of the file that has the +# commit message, followed by the description of the commit +# message's source. The hook's purpose is to edit the commit +# message file. If the hook fails with a non-zero status, +# the commit is aborted. +# +# To enable this hook, rename this file to "prepare-commit-msg". + +# This hook includes three examples. The first comments out the +# "Conflicts:" part of a merge commit. +# +# The second includes the output of "git diff --name-status -r" +# into the message, just before the "git status" output. It is +# commented because it doesn't cope with --amend or with squashed +# commits. +# +# The third example adds a Signed-off-by line to the message, that can +# still be edited. This is rarely a good idea. + +case "$2,$3" in + merge,) + /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;; + +# ,|template,) +# /usr/bin/perl -i.bak -pe ' +# print "\n" . `git diff --cached --name-status -r` +# if /^#/ && $first++ == 0' "$1" ;; + + *) ;; +esac + +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" diff --git a/.zprezto/_.git/modules/modules/prompt/external/powerline/hooks/update.sample b/.zprezto/_.git/modules/modules/prompt/external/powerline/hooks/update.sample new file mode 100755 index 0000000..d847583 --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/external/powerline/hooks/update.sample @@ -0,0 +1,128 @@ +#!/bin/sh +# +# An example hook script to blocks unannotated tags from entering. +# Called by "git receive-pack" with arguments: refname sha1-old sha1-new +# +# To enable this hook, rename this file to "update". +# +# Config +# ------ +# hooks.allowunannotated +# This boolean sets whether unannotated tags will be allowed into the +# repository. By default they won't be. +# hooks.allowdeletetag +# This boolean sets whether deleting tags will be allowed in the +# repository. By default they won't be. +# hooks.allowmodifytag +# This boolean sets whether a tag may be modified after creation. By default +# it won't be. +# hooks.allowdeletebranch +# This boolean sets whether deleting branches will be allowed in the +# repository. By default they won't be. +# hooks.denycreatebranch +# This boolean sets whether remotely creating branches will be denied +# in the repository. By default this is allowed. +# + +# --- Command line +refname="$1" +oldrev="$2" +newrev="$3" + +# --- Safety check +if [ -z "$GIT_DIR" ]; then + echo "Don't run this script from the command line." >&2 + echo " (if you want, you could supply GIT_DIR then run" >&2 + echo " $0 )" >&2 + exit 1 +fi + +if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then + echo "usage: $0 " >&2 + exit 1 +fi + +# --- Config +allowunannotated=$(git config --bool hooks.allowunannotated) +allowdeletebranch=$(git config --bool hooks.allowdeletebranch) +denycreatebranch=$(git config --bool hooks.denycreatebranch) +allowdeletetag=$(git config --bool hooks.allowdeletetag) +allowmodifytag=$(git config --bool hooks.allowmodifytag) + +# check for no description +projectdesc=$(sed -e '1q' "$GIT_DIR/description") +case "$projectdesc" in +"Unnamed repository"* | "") + echo "*** Project description file hasn't been set" >&2 + exit 1 + ;; +esac + +# --- Check types +# if $newrev is 0000...0000, it's a commit to delete a ref. +zero="0000000000000000000000000000000000000000" +if [ "$newrev" = "$zero" ]; then + newrev_type=delete +else + newrev_type=$(git cat-file -t $newrev) +fi + +case "$refname","$newrev_type" in + refs/tags/*,commit) + # un-annotated tag + short_refname=${refname##refs/tags/} + if [ "$allowunannotated" != "true" ]; then + echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2 + echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 + exit 1 + fi + ;; + refs/tags/*,delete) + # delete tag + if [ "$allowdeletetag" != "true" ]; then + echo "*** Deleting a tag is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/tags/*,tag) + # annotated tag + if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 + then + echo "*** Tag '$refname' already exists." >&2 + echo "*** Modifying a tag is not allowed in this repository." >&2 + exit 1 + fi + ;; + refs/heads/*,commit) + # branch + if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then + echo "*** Creating a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/heads/*,delete) + # delete branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/remotes/*,commit) + # tracking branch + ;; + refs/remotes/*,delete) + # delete tracking branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a tracking branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + *) + # Anything else (is there anything else?) + echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 + exit 1 + ;; +esac + +# --- Finished +exit 0 diff --git a/.zprezto/_.git/modules/modules/prompt/external/powerline/index b/.zprezto/_.git/modules/modules/prompt/external/powerline/index new file mode 100644 index 0000000..8432108 Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/external/powerline/index differ diff --git a/.zprezto/_.git/modules/modules/prompt/external/powerline/info/exclude b/.zprezto/_.git/modules/modules/prompt/external/powerline/info/exclude new file mode 100644 index 0000000..a5196d1 --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/external/powerline/info/exclude @@ -0,0 +1,6 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ diff --git a/.zprezto/_.git/modules/modules/prompt/external/powerline/logs/HEAD b/.zprezto/_.git/modules/modules/prompt/external/powerline/logs/HEAD new file mode 100644 index 0000000..bed4301 --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/external/powerline/logs/HEAD @@ -0,0 +1,2 @@ +0000000000000000000000000000000000000000 8e81152340c4beb2d941340d1feb2dc29bbcc309 Abra 1443994575 +0400 clone: from https://github.com/davidjrice/prezto_powerline.git +8e81152340c4beb2d941340d1feb2dc29bbcc309 8e81152340c4beb2d941340d1feb2dc29bbcc309 Abra 1443994575 +0400 checkout: moving from master to 8e81152340c4beb2d941340d1feb2dc29bbcc309 diff --git a/.zprezto/_.git/modules/modules/prompt/external/powerline/logs/refs/heads/master b/.zprezto/_.git/modules/modules/prompt/external/powerline/logs/refs/heads/master new file mode 100644 index 0000000..f33b7ab --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/external/powerline/logs/refs/heads/master @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 8e81152340c4beb2d941340d1feb2dc29bbcc309 Abra 1443994575 +0400 clone: from https://github.com/davidjrice/prezto_powerline.git diff --git a/.zprezto/_.git/modules/modules/prompt/external/powerline/logs/refs/remotes/origin/HEAD b/.zprezto/_.git/modules/modules/prompt/external/powerline/logs/refs/remotes/origin/HEAD new file mode 100644 index 0000000..f33b7ab --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/external/powerline/logs/refs/remotes/origin/HEAD @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 8e81152340c4beb2d941340d1feb2dc29bbcc309 Abra 1443994575 +0400 clone: from https://github.com/davidjrice/prezto_powerline.git diff --git a/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/16/fe64fbc80ac2e5a9c46f874e635f72676f7f28 b/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/16/fe64fbc80ac2e5a9c46f874e635f72676f7f28 new file mode 100644 index 0000000..891ca31 Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/16/fe64fbc80ac2e5a9c46f874e635f72676f7f28 differ diff --git a/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/17/e4b6b11ade0508cc4b3fbe5f54731bffdbf62b b/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/17/e4b6b11ade0508cc4b3fbe5f54731bffdbf62b new file mode 100644 index 0000000..00de598 Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/17/e4b6b11ade0508cc4b3fbe5f54731bffdbf62b differ diff --git a/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/1f/13956be47a14f9f51edd93341ed6af9a9d690b b/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/1f/13956be47a14f9f51edd93341ed6af9a9d690b new file mode 100644 index 0000000..7a5bdc4 Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/1f/13956be47a14f9f51edd93341ed6af9a9d690b differ diff --git a/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/31/102e15f358389bcb600eb7d4685af0b16d8af0 b/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/31/102e15f358389bcb600eb7d4685af0b16d8af0 new file mode 100644 index 0000000..6dc8fea --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/31/102e15f358389bcb600eb7d4685af0b16d8af0 @@ -0,0 +1,3 @@ +xT]o09JS[IBcZ@qnoκεٴ>:s33x7zF +Ph'K$Y W6YuXm &C~//(k (RDUkg 3L*4yc #S9T:cVBBqǬ͏KK&KAk,(z.YUKlXd&ك!{>ڡw zαFMB}a_gɔ0-MNP' EcR2GDg[ +OT$ xrxc0Ie'W"tzHk?g rK6ɖqv'[(I 045;O}EV ^0R!7 ZOu93ݣ)UC do,eCתTc5~8:' sI jGOii-_y>.53dX߿1A),aA( ^o[4CDj*d$w\PE`/}ǙQ\/%wI>%XD<їHH]*Q؎_72m%amZ#æP+\NǓyD \ No newline at end of file diff --git a/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/67/65ebec0ab529ceaa3a45323944acbb7cc7d0db b/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/67/65ebec0ab529ceaa3a45323944acbb7cc7d0db new file mode 100644 index 0000000..f94c915 Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/67/65ebec0ab529ceaa3a45323944acbb7cc7d0db differ diff --git a/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/6f/900c28def19ea2debc1c6f8406750d0a94a054 b/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/6f/900c28def19ea2debc1c6f8406750d0a94a054 new file mode 100644 index 0000000..a045f11 Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/6f/900c28def19ea2debc1c6f8406750d0a94a054 differ diff --git a/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/72/a25138b92ecc4c2fcf8b7b2b2c16d8399786f5 b/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/72/a25138b92ecc4c2fcf8b7b2b2c16d8399786f5 new file mode 100644 index 0000000..72a3ebb Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/72/a25138b92ecc4c2fcf8b7b2b2c16d8399786f5 differ diff --git a/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/76/4b341998288c67ea1b0bbe2bb0f0a37c2c991d b/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/76/4b341998288c67ea1b0bbe2bb0f0a37c2c991d new file mode 100644 index 0000000..08fc8dc Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/76/4b341998288c67ea1b0bbe2bb0f0a37c2c991d differ diff --git a/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/8b/2b6df7f022718f15085b58a72516d5fd4dcd8f b/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/8b/2b6df7f022718f15085b58a72516d5fd4dcd8f new file mode 100644 index 0000000..bdc5a55 Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/8b/2b6df7f022718f15085b58a72516d5fd4dcd8f differ diff --git a/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/8e/81152340c4beb2d941340d1feb2dc29bbcc309 b/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/8e/81152340c4beb2d941340d1feb2dc29bbcc309 new file mode 100644 index 0000000..c3d3538 --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/8e/81152340c4beb2d941340d1feb2dc29bbcc309 @@ -0,0 +1 @@ +xMj0F)f_Y?B&3cǮ<]>>ǣuYfV1HJ,e3>C5[rW`o{{BLGlZCB|En׷#`lUCl;Tns~Lh`;բ4_oX \ No newline at end of file diff --git a/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/8e/ed97618cdb0ab3c467231d0ea26f36f9fbb382 b/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/8e/ed97618cdb0ab3c467231d0ea26f36f9fbb382 new file mode 100644 index 0000000..9521caf Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/8e/ed97618cdb0ab3c467231d0ea26f36f9fbb382 differ diff --git a/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/ab/b9899eab1e56951200a4f29c41936ddbb50784 b/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/ab/b9899eab1e56951200a4f29c41936ddbb50784 new file mode 100644 index 0000000..de0db2b Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/ab/b9899eab1e56951200a4f29c41936ddbb50784 differ diff --git a/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/b1/e6047cb345e93b6faea7cb4824294e392740a2 b/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/b1/e6047cb345e93b6faea7cb4824294e392740a2 new file mode 100644 index 0000000..157079f Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/b1/e6047cb345e93b6faea7cb4824294e392740a2 differ diff --git a/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/b6/2616d845f0a81e51fd3ae51dbf45d04d50153b b/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/b6/2616d845f0a81e51fd3ae51dbf45d04d50153b new file mode 100644 index 0000000..6b176bc Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/b6/2616d845f0a81e51fd3ae51dbf45d04d50153b differ diff --git a/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/cc/381a39a0b3662e5b5068c410232822e6c90caf b/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/cc/381a39a0b3662e5b5068c410232822e6c90caf new file mode 100644 index 0000000..a235f53 --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/cc/381a39a0b3662e5b5068c410232822e6c90caf @@ -0,0 +1 @@ +xSMk0ٿbBX/xՏ[@’ -)AǶY2esoH&d{g{޸P?~z1;JjX7lob-L˜Rghtg]Kf-I.ޢKlBDi;OůCa H]XZsZSJb s.k"8q灤2] =릳a-!۹~K ]隔}ѼP@8`="Ypb'hu#ݸ!@bgJsd>m22ŷ-Kx^ղhskBGac0u!{<>YA5gȐN$O<eI \ No newline at end of file diff --git a/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/cd/138e33d2e8dda02927277b7d3e4de1837ba36c b/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/cd/138e33d2e8dda02927277b7d3e4de1837ba36c new file mode 100644 index 0000000..f9ef5b8 Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/cd/138e33d2e8dda02927277b7d3e4de1837ba36c differ diff --git a/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/d4/08248c117db75d0d2f0c61e1c3126b3ed14d35 b/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/d4/08248c117db75d0d2f0c61e1c3126b3ed14d35 new file mode 100644 index 0000000..e421ec9 --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/d4/08248c117db75d0d2f0c61e1c3126b3ed14d35 @@ -0,0 +1,2 @@ +xM F]sٛ4$Ƹ0P"CV[/+(v0C"eDNv#Jcsp葌M OlNw$D{'AK۪9.yz +Gpx/6anF +[?7i~~[P<-[-Jb \ No newline at end of file diff --git a/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/d7/1ea101c9928a08ef0117de740ac0642df77494 b/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/d7/1ea101c9928a08ef0117de740ac0642df77494 new file mode 100644 index 0000000..60dff22 Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/d7/1ea101c9928a08ef0117de740ac0642df77494 differ diff --git a/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/f8/17c81c22153b35bde9c0f2930f59ef83aedf6f b/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/f8/17c81c22153b35bde9c0f2930f59ef83aedf6f new file mode 100644 index 0000000..0385927 Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/f8/17c81c22153b35bde9c0f2930f59ef83aedf6f differ diff --git a/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/f9/26f14ef2689de5baed4155a779745bada4956f b/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/f9/26f14ef2689de5baed4155a779745bada4956f new file mode 100644 index 0000000..2d1bb34 Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/external/powerline/objects/f9/26f14ef2689de5baed4155a779745bada4956f differ diff --git a/.zprezto/_.git/modules/modules/prompt/external/powerline/packed-refs b/.zprezto/_.git/modules/modules/prompt/external/powerline/packed-refs new file mode 100644 index 0000000..6478130 --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/external/powerline/packed-refs @@ -0,0 +1,2 @@ +# pack-refs with: peeled fully-peeled +8e81152340c4beb2d941340d1feb2dc29bbcc309 refs/remotes/origin/master diff --git a/.zprezto/_.git/modules/modules/prompt/external/powerline/refs/heads/master b/.zprezto/_.git/modules/modules/prompt/external/powerline/refs/heads/master new file mode 100644 index 0000000..17d5321 --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/external/powerline/refs/heads/master @@ -0,0 +1 @@ +8e81152340c4beb2d941340d1feb2dc29bbcc309 diff --git a/.zprezto/_.git/modules/modules/prompt/external/powerline/refs/remotes/origin/HEAD b/.zprezto/_.git/modules/modules/prompt/external/powerline/refs/remotes/origin/HEAD new file mode 100644 index 0000000..6efe28f --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/external/powerline/refs/remotes/origin/HEAD @@ -0,0 +1 @@ +ref: refs/remotes/origin/master diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/FETCH_HEAD b/.zprezto/_.git/modules/modules/prompt/functions/pure/FETCH_HEAD new file mode 100644 index 0000000..8244a51 --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/functions/pure/FETCH_HEAD @@ -0,0 +1,2 @@ +7d96270704e0dfa1162e33398176bb6b792d615c not-for-merge branch 'master' of https://github.com/sindresorhus/pure +7cf9282d31b182ec666574b909b63d4539bb085d not-for-merge tag 'v1.3.0' of https://github.com/sindresorhus/pure diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/HEAD b/.zprezto/_.git/modules/modules/prompt/functions/pure/HEAD new file mode 100644 index 0000000..7e8a89a --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/functions/pure/HEAD @@ -0,0 +1 @@ +95e7fd7de7af9cf68678c31cac22b79816b44c90 diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/config b/.zprezto/_.git/modules/modules/prompt/functions/pure/config new file mode 100755 index 0000000..f308615 --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/functions/pure/config @@ -0,0 +1,14 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + worktree = ../../../../../../modules/prompt/external/pure + ignorecase = true + precomposeunicode = true +[remote "origin"] + url = https://github.com/sindresorhus/pure.git + fetch = +refs/heads/*:refs/remotes/origin/* +[branch "master"] + remote = origin + merge = refs/heads/master diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/description b/.zprezto/_.git/modules/modules/prompt/functions/pure/description new file mode 100644 index 0000000..498b267 --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/functions/pure/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/hooks/applypatch-msg.sample b/.zprezto/_.git/modules/modules/prompt/functions/pure/hooks/applypatch-msg.sample new file mode 100755 index 0000000..8b2a2fe --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/functions/pure/hooks/applypatch-msg.sample @@ -0,0 +1,15 @@ +#!/bin/sh +# +# An example hook script to check the commit log message taken by +# applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. The hook is +# allowed to edit the commit message file. +# +# To enable this hook, rename this file to "applypatch-msg". + +. git-sh-setup +test -x "$GIT_DIR/hooks/commit-msg" && + exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"} +: diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/hooks/commit-msg.sample b/.zprezto/_.git/modules/modules/prompt/functions/pure/hooks/commit-msg.sample new file mode 100755 index 0000000..b58d118 --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/functions/pure/hooks/commit-msg.sample @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to check the commit log message. +# Called by "git commit" with one argument, the name of the file +# that has the commit message. The hook should exit with non-zero +# status after issuing an appropriate message if it wants to stop the +# commit. The hook is allowed to edit the commit message file. +# +# To enable this hook, rename this file to "commit-msg". + +# Uncomment the below to add a Signed-off-by line to the message. +# Doing this in a hook is a bad idea in general, but the prepare-commit-msg +# hook is more suited to it. +# +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" + +# This example catches duplicate Signed-off-by lines. + +test "" = "$(grep '^Signed-off-by: ' "$1" | + sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { + echo >&2 Duplicate Signed-off-by lines. + exit 1 +} diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/hooks/post-update.sample b/.zprezto/_.git/modules/modules/prompt/functions/pure/hooks/post-update.sample new file mode 100755 index 0000000..ec17ec1 --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/functions/pure/hooks/post-update.sample @@ -0,0 +1,8 @@ +#!/bin/sh +# +# An example hook script to prepare a packed repository for use over +# dumb transports. +# +# To enable this hook, rename this file to "post-update". + +exec git update-server-info diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/hooks/pre-applypatch.sample b/.zprezto/_.git/modules/modules/prompt/functions/pure/hooks/pre-applypatch.sample new file mode 100755 index 0000000..b1f187c --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/functions/pure/hooks/pre-applypatch.sample @@ -0,0 +1,14 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed +# by applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-applypatch". + +. git-sh-setup +test -x "$GIT_DIR/hooks/pre-commit" && + exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"} +: diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/hooks/pre-commit.sample b/.zprezto/_.git/modules/modules/prompt/functions/pure/hooks/pre-commit.sample new file mode 100755 index 0000000..68d62d5 --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/functions/pure/hooks/pre-commit.sample @@ -0,0 +1,49 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git commit" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message if +# it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-commit". + +if git rev-parse --verify HEAD >/dev/null 2>&1 +then + against=HEAD +else + # Initial commit: diff against an empty tree object + against=4b825dc642cb6eb9a060e54bf8d69288fbee4904 +fi + +# If you want to allow non-ASCII filenames set this variable to true. +allownonascii=$(git config --bool hooks.allownonascii) + +# Redirect output to stderr. +exec 1>&2 + +# Cross platform projects tend to avoid non-ASCII filenames; prevent +# them from being added to the repository. We exploit the fact that the +# printable range starts at the space character and ends with tilde. +if [ "$allownonascii" != "true" ] && + # Note that the use of brackets around a tr range is ok here, (it's + # even required, for portability to Solaris 10's /usr/bin/tr), since + # the square bracket bytes happen to fall in the designated range. + test $(git diff --cached --name-only --diff-filter=A -z $against | + LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 +then + cat <<\EOF +Error: Attempt to add a non-ASCII file name. + +This can cause problems if you want to work with people on other platforms. + +To be portable it is advisable to rename the file. + +If you know what you are doing you can disable this check using: + + git config hooks.allownonascii true +EOF + exit 1 +fi + +# If there are whitespace errors, print the offending file names and fail. +exec git diff-index --check --cached $against -- diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/hooks/pre-push.sample b/.zprezto/_.git/modules/modules/prompt/functions/pure/hooks/pre-push.sample new file mode 100755 index 0000000..69e3c67 --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/functions/pure/hooks/pre-push.sample @@ -0,0 +1,54 @@ +#!/bin/sh + +# An example hook script to verify what is about to be pushed. Called by "git +# push" after it has checked the remote status, but before anything has been +# pushed. If this script exits with a non-zero status nothing will be pushed. +# +# This hook is called with the following parameters: +# +# $1 -- Name of the remote to which the push is being done +# $2 -- URL to which the push is being done +# +# If pushing without using a named remote those arguments will be equal. +# +# Information about the commits which are being pushed is supplied as lines to +# the standard input in the form: +# +# +# +# This sample shows how to prevent push of commits where the log message starts +# with "WIP" (work in progress). + +remote="$1" +url="$2" + +z40=0000000000000000000000000000000000000000 + +IFS=' ' +while read local_ref local_sha remote_ref remote_sha +do + if [ "$local_sha" = $z40 ] + then + # Handle delete + : + else + if [ "$remote_sha" = $z40 ] + then + # New branch, examine all commits + range="$local_sha" + else + # Update to existing branch, examine new commits + range="$remote_sha..$local_sha" + fi + + # Check for WIP commit + commit=`git rev-list -n 1 --grep '^WIP' "$range"` + if [ -n "$commit" ] + then + echo >&2 "Found WIP commit in $local_ref, not pushing" + exit 1 + fi + fi +done + +exit 0 diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/hooks/pre-rebase.sample b/.zprezto/_.git/modules/modules/prompt/functions/pure/hooks/pre-rebase.sample new file mode 100755 index 0000000..9773ed4 --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/functions/pure/hooks/pre-rebase.sample @@ -0,0 +1,169 @@ +#!/bin/sh +# +# Copyright (c) 2006, 2008 Junio C Hamano +# +# The "pre-rebase" hook is run just before "git rebase" starts doing +# its job, and can prevent the command from running by exiting with +# non-zero status. +# +# The hook is called with the following parameters: +# +# $1 -- the upstream the series was forked from. +# $2 -- the branch being rebased (or empty when rebasing the current branch). +# +# This sample shows how to prevent topic branches that are already +# merged to 'next' branch from getting rebased, because allowing it +# would result in rebasing already published history. + +publish=next +basebranch="$1" +if test "$#" = 2 +then + topic="refs/heads/$2" +else + topic=`git symbolic-ref HEAD` || + exit 0 ;# we do not interrupt rebasing detached HEAD +fi + +case "$topic" in +refs/heads/??/*) + ;; +*) + exit 0 ;# we do not interrupt others. + ;; +esac + +# Now we are dealing with a topic branch being rebased +# on top of master. Is it OK to rebase it? + +# Does the topic really exist? +git show-ref -q "$topic" || { + echo >&2 "No such branch $topic" + exit 1 +} + +# Is topic fully merged to master? +not_in_master=`git rev-list --pretty=oneline ^master "$topic"` +if test -z "$not_in_master" +then + echo >&2 "$topic is fully merged to master; better remove it." + exit 1 ;# we could allow it, but there is no point. +fi + +# Is topic ever merged to next? If so you should not be rebasing it. +only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` +only_next_2=`git rev-list ^master ${publish} | sort` +if test "$only_next_1" = "$only_next_2" +then + not_in_topic=`git rev-list "^$topic" master` + if test -z "$not_in_topic" + then + echo >&2 "$topic is already up-to-date with master" + exit 1 ;# we could allow it, but there is no point. + else + exit 0 + fi +else + not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` + /usr/bin/perl -e ' + my $topic = $ARGV[0]; + my $msg = "* $topic has commits already merged to public branch:\n"; + my (%not_in_next) = map { + /^([0-9a-f]+) /; + ($1 => 1); + } split(/\n/, $ARGV[1]); + for my $elem (map { + /^([0-9a-f]+) (.*)$/; + [$1 => $2]; + } split(/\n/, $ARGV[2])) { + if (!exists $not_in_next{$elem->[0]}) { + if ($msg) { + print STDERR $msg; + undef $msg; + } + print STDERR " $elem->[1]\n"; + } + } + ' "$topic" "$not_in_next" "$not_in_master" + exit 1 +fi + +exit 0 + +################################################################ + +This sample hook safeguards topic branches that have been +published from being rewound. + +The workflow assumed here is: + + * Once a topic branch forks from "master", "master" is never + merged into it again (either directly or indirectly). + + * Once a topic branch is fully cooked and merged into "master", + it is deleted. If you need to build on top of it to correct + earlier mistakes, a new topic branch is created by forking at + the tip of the "master". This is not strictly necessary, but + it makes it easier to keep your history simple. + + * Whenever you need to test or publish your changes to topic + branches, merge them into "next" branch. + +The script, being an example, hardcodes the publish branch name +to be "next", but it is trivial to make it configurable via +$GIT_DIR/config mechanism. + +With this workflow, you would want to know: + +(1) ... if a topic branch has ever been merged to "next". Young + topic branches can have stupid mistakes you would rather + clean up before publishing, and things that have not been + merged into other branches can be easily rebased without + affecting other people. But once it is published, you would + not want to rewind it. + +(2) ... if a topic branch has been fully merged to "master". + Then you can delete it. More importantly, you should not + build on top of it -- other people may already want to + change things related to the topic as patches against your + "master", so if you need further changes, it is better to + fork the topic (perhaps with the same name) afresh from the + tip of "master". + +Let's look at this example: + + o---o---o---o---o---o---o---o---o---o "next" + / / / / + / a---a---b A / / + / / / / + / / c---c---c---c B / + / / / \ / + / / / b---b C \ / + / / / / \ / + ---o---o---o---o---o---o---o---o---o---o---o "master" + + +A, B and C are topic branches. + + * A has one fix since it was merged up to "next". + + * B has finished. It has been fully merged up to "master" and "next", + and is ready to be deleted. + + * C has not merged to "next" at all. + +We would want to allow C to be rebased, refuse A, and encourage +B to be deleted. + +To compute (1): + + git rev-list ^master ^topic next + git rev-list ^master next + + if these match, topic has not merged in next at all. + +To compute (2): + + git rev-list master..topic + + if this is empty, it is fully merged to "master". diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/hooks/prepare-commit-msg.sample b/.zprezto/_.git/modules/modules/prompt/functions/pure/hooks/prepare-commit-msg.sample new file mode 100755 index 0000000..f093a02 --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/functions/pure/hooks/prepare-commit-msg.sample @@ -0,0 +1,36 @@ +#!/bin/sh +# +# An example hook script to prepare the commit log message. +# Called by "git commit" with the name of the file that has the +# commit message, followed by the description of the commit +# message's source. The hook's purpose is to edit the commit +# message file. If the hook fails with a non-zero status, +# the commit is aborted. +# +# To enable this hook, rename this file to "prepare-commit-msg". + +# This hook includes three examples. The first comments out the +# "Conflicts:" part of a merge commit. +# +# The second includes the output of "git diff --name-status -r" +# into the message, just before the "git status" output. It is +# commented because it doesn't cope with --amend or with squashed +# commits. +# +# The third example adds a Signed-off-by line to the message, that can +# still be edited. This is rarely a good idea. + +case "$2,$3" in + merge,) + /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;; + +# ,|template,) +# /usr/bin/perl -i.bak -pe ' +# print "\n" . `git diff --cached --name-status -r` +# if /^#/ && $first++ == 0' "$1" ;; + + *) ;; +esac + +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/hooks/update.sample b/.zprezto/_.git/modules/modules/prompt/functions/pure/hooks/update.sample new file mode 100755 index 0000000..d847583 --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/functions/pure/hooks/update.sample @@ -0,0 +1,128 @@ +#!/bin/sh +# +# An example hook script to blocks unannotated tags from entering. +# Called by "git receive-pack" with arguments: refname sha1-old sha1-new +# +# To enable this hook, rename this file to "update". +# +# Config +# ------ +# hooks.allowunannotated +# This boolean sets whether unannotated tags will be allowed into the +# repository. By default they won't be. +# hooks.allowdeletetag +# This boolean sets whether deleting tags will be allowed in the +# repository. By default they won't be. +# hooks.allowmodifytag +# This boolean sets whether a tag may be modified after creation. By default +# it won't be. +# hooks.allowdeletebranch +# This boolean sets whether deleting branches will be allowed in the +# repository. By default they won't be. +# hooks.denycreatebranch +# This boolean sets whether remotely creating branches will be denied +# in the repository. By default this is allowed. +# + +# --- Command line +refname="$1" +oldrev="$2" +newrev="$3" + +# --- Safety check +if [ -z "$GIT_DIR" ]; then + echo "Don't run this script from the command line." >&2 + echo " (if you want, you could supply GIT_DIR then run" >&2 + echo " $0 )" >&2 + exit 1 +fi + +if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then + echo "usage: $0 " >&2 + exit 1 +fi + +# --- Config +allowunannotated=$(git config --bool hooks.allowunannotated) +allowdeletebranch=$(git config --bool hooks.allowdeletebranch) +denycreatebranch=$(git config --bool hooks.denycreatebranch) +allowdeletetag=$(git config --bool hooks.allowdeletetag) +allowmodifytag=$(git config --bool hooks.allowmodifytag) + +# check for no description +projectdesc=$(sed -e '1q' "$GIT_DIR/description") +case "$projectdesc" in +"Unnamed repository"* | "") + echo "*** Project description file hasn't been set" >&2 + exit 1 + ;; +esac + +# --- Check types +# if $newrev is 0000...0000, it's a commit to delete a ref. +zero="0000000000000000000000000000000000000000" +if [ "$newrev" = "$zero" ]; then + newrev_type=delete +else + newrev_type=$(git cat-file -t $newrev) +fi + +case "$refname","$newrev_type" in + refs/tags/*,commit) + # un-annotated tag + short_refname=${refname##refs/tags/} + if [ "$allowunannotated" != "true" ]; then + echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2 + echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 + exit 1 + fi + ;; + refs/tags/*,delete) + # delete tag + if [ "$allowdeletetag" != "true" ]; then + echo "*** Deleting a tag is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/tags/*,tag) + # annotated tag + if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 + then + echo "*** Tag '$refname' already exists." >&2 + echo "*** Modifying a tag is not allowed in this repository." >&2 + exit 1 + fi + ;; + refs/heads/*,commit) + # branch + if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then + echo "*** Creating a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/heads/*,delete) + # delete branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/remotes/*,commit) + # tracking branch + ;; + refs/remotes/*,delete) + # delete tracking branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a tracking branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + *) + # Anything else (is there anything else?) + echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 + exit 1 + ;; +esac + +# --- Finished +exit 0 diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/index b/.zprezto/_.git/modules/modules/prompt/functions/pure/index new file mode 100644 index 0000000..dc52662 Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/functions/pure/index differ diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/info/exclude b/.zprezto/_.git/modules/modules/prompt/functions/pure/info/exclude new file mode 100644 index 0000000..a5196d1 --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/functions/pure/info/exclude @@ -0,0 +1,6 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/logs/HEAD b/.zprezto/_.git/modules/modules/prompt/functions/pure/logs/HEAD new file mode 100644 index 0000000..d7d8a1f --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/functions/pure/logs/HEAD @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 95e7fd7de7af9cf68678c31cac22b79816b44c90 Abra 1443994577 +0400 clone: from https://github.com/sindresorhus/pure.git +95e7fd7de7af9cf68678c31cac22b79816b44c90 04212522f39f43998d001b4a94b05856f010a54b Abra 1443994577 +0400 checkout: moving from master to 04212522f39f43998d001b4a94b05856f010a54b +04212522f39f43998d001b4a94b05856f010a54b 95e7fd7de7af9cf68678c31cac22b79816b44c90 Abra 1456189975 +0400 checkout: moving from 04212522f39f43998d001b4a94b05856f010a54b to 95e7fd7de7af9cf68678c31cac22b79816b44c90 diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/logs/refs/heads/master b/.zprezto/_.git/modules/modules/prompt/functions/pure/logs/refs/heads/master new file mode 100644 index 0000000..c7f4761 --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/functions/pure/logs/refs/heads/master @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 95e7fd7de7af9cf68678c31cac22b79816b44c90 Abra 1443994577 +0400 clone: from https://github.com/sindresorhus/pure.git diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/logs/refs/remotes/origin/HEAD b/.zprezto/_.git/modules/modules/prompt/functions/pure/logs/refs/remotes/origin/HEAD new file mode 100644 index 0000000..c7f4761 --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/functions/pure/logs/refs/remotes/origin/HEAD @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 95e7fd7de7af9cf68678c31cac22b79816b44c90 Abra 1443994577 +0400 clone: from https://github.com/sindresorhus/pure.git diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/logs/refs/remotes/origin/master b/.zprezto/_.git/modules/modules/prompt/functions/pure/logs/refs/remotes/origin/master new file mode 100644 index 0000000..d2e88aa --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/functions/pure/logs/refs/remotes/origin/master @@ -0,0 +1 @@ +95e7fd7de7af9cf68678c31cac22b79816b44c90 7d96270704e0dfa1162e33398176bb6b792d615c Andrey Anurin 1463466100 -0700 pull: fast-forward diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/00/e0571f675d1e5db4a9646feee77a14d9b3086e b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/00/e0571f675d1e5db4a9646feee77a14d9b3086e new file mode 100644 index 0000000..7c66c94 --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/00/e0571f675d1e5db4a9646feee77a14d9b3086e @@ -0,0 +1 @@ +x]J0}*(jNׂN6д5I܀o3 㷜Sifb4f bdF*b5nkd/kS(,$FQ~'oЙ=soeGGp|Tx7[omʔ'W@9(#GxVL_нscY}/b2/*L麏=Pc5@My_R6?w!B-mk+zd \ No newline at end of file diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/01/c74e16685768bb004aaffe759fe6494f12f5a4 b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/01/c74e16685768bb004aaffe759fe6494f12f5a4 new file mode 100644 index 0000000..e7e72d9 Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/01/c74e16685768bb004aaffe759fe6494f12f5a4 differ diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/02/3b292d221d7dd387b86fff41efdc6a775b6dfb b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/02/3b292d221d7dd387b86fff41efdc6a775b6dfb new file mode 100644 index 0000000..89d71e5 Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/02/3b292d221d7dd387b86fff41efdc6a775b6dfb differ diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/0d/52f0c16409c45ae6eace5c0a9cbdb92ec7b5a7 b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/0d/52f0c16409c45ae6eace5c0a9cbdb92ec7b5a7 new file mode 100644 index 0000000..90a6dc7 Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/0d/52f0c16409c45ae6eace5c0a9cbdb92ec7b5a7 differ diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/0f/7b001d363d4609aaf4e4f27299d6c70ab85e2e b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/0f/7b001d363d4609aaf4e4f27299d6c70ab85e2e new file mode 100644 index 0000000..c6a441f Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/0f/7b001d363d4609aaf4e4f27299d6c70ab85e2e differ diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/22/c4f0b4039db47e928a4c530c222b1bf6be6631 b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/22/c4f0b4039db47e928a4c530c222b1bf6be6631 new file mode 100644 index 0000000..a625c76 Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/22/c4f0b4039db47e928a4c530c222b1bf6be6631 differ diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/26/4658de3742b2c82211ef08193302e8cbf1714f b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/26/4658de3742b2c82211ef08193302e8cbf1714f new file mode 100644 index 0000000..feb2e7d --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/26/4658de3742b2c82211ef08193302e8cbf1714f @@ -0,0 +1,2 @@ +xIN1CY)B\Udp +$S ʲe=i[4W<ʰĊsB8eMJUe!/\HTsq/Q9+4ih0)I(+-CU:OkVǽ[vw%LKږwJy!6gl8W 't*~vN:*u[9a}]B;F᫁>}Z)gI8Oi "2ȿ)u \ No newline at end of file diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/26/8bbff64b311c96c02f9fa8280852c752173108 b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/26/8bbff64b311c96c02f9fa8280852c752173108 new file mode 100644 index 0000000..664a4c6 Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/26/8bbff64b311c96c02f9fa8280852c752173108 differ diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/27/e921a0be378e9f1e779dff2ce9b1bcfa886012 b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/27/e921a0be378e9f1e779dff2ce9b1bcfa886012 new file mode 100644 index 0000000..60c2903 --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/27/e921a0be378e9f1e779dff2ce9b1bcfa886012 @@ -0,0 +1 @@ +xJ0E}? (I4" $afM7*~{ظ, KA{4 \#uNkvDk[I+CMo;+jPR(??ǹh5E^xQK8[b)`c"9g} |P\JUjZ?+;Q .~“r&xxG^v1tKϯe)7Re MSl7 (G E +&]̲0-y;r7 [cNE4FfLux5Bz|mCJc!l'' AR3.).v.lLY. \ No newline at end of file diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/41/62d3b60ebcaf6ed65c732586e8564910ef1397 b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/41/62d3b60ebcaf6ed65c732586e8564910ef1397 new file mode 100644 index 0000000..b8e20fc Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/41/62d3b60ebcaf6ed65c732586e8564910ef1397 differ diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/42/1aae333f1f0c82078d4b9fab27e87d63730612 b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/42/1aae333f1f0c82078d4b9fab27e87d63730612 new file mode 100644 index 0000000..214c625 Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/42/1aae333f1f0c82078d4b9fab27e87d63730612 differ diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/42/7dc614c3326cff956139cdb6aaabc86cd54844 b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/42/7dc614c3326cff956139cdb6aaabc86cd54844 new file mode 100644 index 0000000..c6ce8c1 Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/42/7dc614c3326cff956139cdb6aaabc86cd54844 differ diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/45/aeffd2d16415dc809281d9618ebc4fc332c5ef b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/45/aeffd2d16415dc809281d9618ebc4fc332c5ef new file mode 100644 index 0000000..53d8bcf --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/45/aeffd2d16415dc809281d9618ebc4fc332c5ef @@ -0,0 +1 @@ +xKj1)y&d]޷zkd|슂V:ȇ6:@$#!eʁ1MIA07͞2I%@2b9FfIip]oҩ<^TYx䙝c֚w{JkckkF7;N \ No newline at end of file diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/45/ef73ec3401e0e795aa36e09f8dc864288f50a0 b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/45/ef73ec3401e0e795aa36e09f8dc864288f50a0 new file mode 100644 index 0000000..31ed294 Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/45/ef73ec3401e0e795aa36e09f8dc864288f50a0 differ diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/4f/32d141dce20c7abe7e7b0cc83805bfc77cdae3 b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/4f/32d141dce20c7abe7e7b0cc83805bfc77cdae3 new file mode 100644 index 0000000..573e5e0 Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/4f/32d141dce20c7abe7e7b0cc83805bfc77cdae3 differ diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/66/dc495c30ed09788f67d584af130726af91bc69 b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/66/dc495c30ed09788f67d584af130726af91bc69 new file mode 100644 index 0000000..35b825c Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/66/dc495c30ed09788f67d584af130726af91bc69 differ diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/67/f4c213d295ee50b61b68cbd584dd19efcee273 b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/67/f4c213d295ee50b61b68cbd584dd19efcee273 new file mode 100644 index 0000000..a1d9fe6 Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/67/f4c213d295ee50b61b68cbd584dd19efcee273 differ diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/6d/2998ac588ccb73c09ec8a8f2a9f515996c7fd0 b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/6d/2998ac588ccb73c09ec8a8f2a9f515996c7fd0 new file mode 100644 index 0000000..987ccb1 Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/6d/2998ac588ccb73c09ec8a8f2a9f515996c7fd0 differ diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/6d/480638b7543a1677c7a94823edaa5a6f5d52b1 b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/6d/480638b7543a1677c7a94823edaa5a6f5d52b1 new file mode 100644 index 0000000..12fb622 --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/6d/480638b7543a1677c7a94823edaa5a6f5d52b1 @@ -0,0 +1,3 @@ +xM0F98"`Ɖ"!Pcw#%b;nqAs"T +I(i=ژjBRT[l⩀Ps g  ںFu45o_=;"5KOSJ3\1+qY~]!i:!O>qi;hBc + :8mv0@sK2!iow5UգN~%ͮq?1 \ No newline at end of file diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/74/dbfba33ec31c50b3b41071d13a01e7c0de6517 b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/74/dbfba33ec31c50b3b41071d13a01e7c0de6517 new file mode 100644 index 0000000..0292a91 Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/74/dbfba33ec31c50b3b41071d13a01e7c0de6517 differ diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/79/b1514fd46560ec8393713c0bff769ba1448e2d b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/79/b1514fd46560ec8393713c0bff769ba1448e2d new file mode 100644 index 0000000..c3f3dec --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/79/b1514fd46560ec8393713c0bff769ba1448e2d @@ -0,0 +1,3 @@ +xN E]/qq2 +$Ƹ01%S)o/1wwPsN w|Ar^h +!NICއNzP5~;T\{mܓR \ No newline at end of file diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/8f/338687d1674597e0bbd11838416abc36c420e7 b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/8f/338687d1674597e0bbd11838416abc36c420e7 new file mode 100644 index 0000000..0d7c32b Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/8f/338687d1674597e0bbd11838416abc36c420e7 differ diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/90/9eb460c0f525913ea5f3b228476dbd73914f7f b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/90/9eb460c0f525913ea5f3b228476dbd73914f7f new file mode 100644 index 0000000..729d528 Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/90/9eb460c0f525913ea5f3b228476dbd73914f7f differ diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/92/83d6a7bf48aeae8a6c7ace6aca94f8eb82ea79 b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/92/83d6a7bf48aeae8a6c7ace6aca94f8eb82ea79 new file mode 100644 index 0000000..6de8b46 Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/92/83d6a7bf48aeae8a6c7ace6aca94f8eb82ea79 differ diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/99/292b37ecee70f2cb81124c4284ff49cace7cb7 b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/99/292b37ecee70f2cb81124c4284ff49cace7cb7 new file mode 100644 index 0000000..95353b9 Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/99/292b37ecee70f2cb81124c4284ff49cace7cb7 differ diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/99/c74851035ca1f5a8a6b649f7e405e8f87f4b8b b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/99/c74851035ca1f5a8a6b649f7e405e8f87f4b8b new file mode 100644 index 0000000..13bf567 Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/99/c74851035ca1f5a8a6b649f7e405e8f87f4b8b differ diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/9b/bcf4bd96c3217e7a341cf7683656c8c1c87294 b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/9b/bcf4bd96c3217e7a341cf7683656c8c1c87294 new file mode 100644 index 0000000..5206f13 Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/9b/bcf4bd96c3217e7a341cf7683656c8c1c87294 differ diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/9d/808db9fe2175543248c2adfa009f8d8fd9805f b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/9d/808db9fe2175543248c2adfa009f8d8fd9805f new file mode 100644 index 0000000..1fa8efc Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/9d/808db9fe2175543248c2adfa009f8d8fd9805f differ diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/9d/e635ee1089ee066553e67ac53cb79e0660c066 b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/9d/e635ee1089ee066553e67ac53cb79e0660c066 new file mode 100644 index 0000000..e1b80ad --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/9d/e635ee1089ee066553e67ac53cb79e0660c066 @@ -0,0 +1,4 @@ +x}Aj0E),I-)RȮPLQ,YAC_t>sbPn~J.XaERL^a(6SXiepL 8X?J^qVWn +KJ +qǷ[t?_AjmB"COR +Jp)uڎm ǽ4gi$|} b [&N֟~99RY _ \ No newline at end of file diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/9e/4955cf91830dbb13fb405652af6d3b6ea07186 b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/9e/4955cf91830dbb13fb405652af6d3b6ea07186 new file mode 100644 index 0000000..9e078fc Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/9e/4955cf91830dbb13fb405652af6d3b6ea07186 differ diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/9f/197c864cda79d2a0146c3345ff008fa9de4f6d b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/9f/197c864cda79d2a0146c3345ff008fa9de4f6d new file mode 100644 index 0000000..608579b Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/9f/197c864cda79d2a0146c3345ff008fa9de4f6d differ diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/a0/6185167d580da8798f94df68145c5bf7cd0bee b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/a0/6185167d580da8798f94df68145c5bf7cd0bee new file mode 100644 index 0000000..a654573 Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/a0/6185167d580da8798f94df68145c5bf7cd0bee differ diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/a0/a3e88480b70e3057b34f818df209ab9dc8ac84 b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/a0/a3e88480b70e3057b34f818df209ab9dc8ac84 new file mode 100644 index 0000000..7ad4eca Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/a0/a3e88480b70e3057b34f818df209ab9dc8ac84 differ diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/a1/d007ce975329ac9ab7e9bb0d008bf20072fabd b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/a1/d007ce975329ac9ab7e9bb0d008bf20072fabd new file mode 100644 index 0000000..9ef5dc7 Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/a1/d007ce975329ac9ab7e9bb0d008bf20072fabd differ diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/a2/48491768a46a3cfc033805a4a26afecc03c990 b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/a2/48491768a46a3cfc033805a4a26afecc03c990 new file mode 100644 index 0000000..71f1d57 Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/a2/48491768a46a3cfc033805a4a26afecc03c990 differ diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/a4/d702a7a25f9d599d89a6b233525ae5f1e036e0 b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/a4/d702a7a25f9d599d89a6b233525ae5f1e036e0 new file mode 100644 index 0000000..a39637b Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/a4/d702a7a25f9d599d89a6b233525ae5f1e036e0 differ diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/a7/096f3e8aac19306a4764c7d4bd4d4740e91763 b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/a7/096f3e8aac19306a4764c7d4bd4d4740e91763 new file mode 100644 index 0000000..bc5f064 --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/a7/096f3e8aac19306a4764c7d4bd4d4740e91763 @@ -0,0 +1,5 @@ +xeSMk1ٿb؆lړCB!@B]"{GnH73olr ܈jUwޙd-|P&۲P/k+BU p ܶaѴj 9ݷ% +SlEp^Hl'|P2 +Õ?ا]zgFX'l \;9X$h?sT</Z!X;RʸI 2@_9;J6ts V~%Pـ\炨9xbLk$ bI +̾U%'8?maXPcU4)5)ݩm8xyH.C:wXBo{@)Vf.b~F 3ցB0a +& ~qtt־8oA`גG^η&x: +E N5C$*k(٨0#?:v:>?\7j &_pdy/s|9,:Rha +qxnbI>jwKsPU \ No newline at end of file diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/ba/9b31249d40cefac6a2fe7ab5ce18a334612d57 b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/ba/9b31249d40cefac6a2fe7ab5ce18a334612d57 new file mode 100644 index 0000000..b7439d6 Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/ba/9b31249d40cefac6a2fe7ab5ce18a334612d57 differ diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/c6/564a4f7c0ab7a8ef62516278bdca2577432300 b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/c6/564a4f7c0ab7a8ef62516278bdca2577432300 new file mode 100644 index 0000000..fc99b4c --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/c6/564a4f7c0ab7a8ef62516278bdca2577432300 @@ -0,0 +1,2 @@ +xKj0D) $ْ!\`VsV1XD@Uu0ƽ 6UXKrر /9Fܱa]H##{GxF&kFvBN)٪)AeV%M'g +툕Zlٞ=qߩ/PvW&bW7 ו~;T9uxrTKbƈ`Ht́/.on \ No newline at end of file diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/c8/91f113f57ecd72758e060bcb7578406afa7f17 b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/c8/91f113f57ecd72758e060bcb7578406afa7f17 new file mode 100644 index 0000000..d072060 Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/c8/91f113f57ecd72758e060bcb7578406afa7f17 differ diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/cd/722b95b9babc9907a5e7d79ff54d3a4eaec19b b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/cd/722b95b9babc9907a5e7d79ff54d3a4eaec19b new file mode 100644 index 0000000..322c3dc Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/cd/722b95b9babc9907a5e7d79ff54d3a4eaec19b differ diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/d1/de22005aed557b8de1289e83fc0372540141db b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/d1/de22005aed557b8de1289e83fc0372540141db new file mode 100644 index 0000000..1b61385 Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/d1/de22005aed557b8de1289e83fc0372540141db differ diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/dc/30cc6b0364a16d73aa83645a6e386279fa043f b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/dc/30cc6b0364a16d73aa83645a6e386279fa043f new file mode 100644 index 0000000..93f9ed6 --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/dc/30cc6b0364a16d73aa83645a6e386279fa043f @@ -0,0 +1 @@ +x1N0}ډmVBhFzSz8/Xp#XG \ No newline at end of file diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/e8/48ddf3c977105bcdbed85a9946164b3f30aa8f b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/e8/48ddf3c977105bcdbed85a9946164b3f30aa8f new file mode 100644 index 0000000..6acec52 Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/e8/48ddf3c977105bcdbed85a9946164b3f30aa8f differ diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/ec/525b2563b185cdb83b9747c1445ed915962806 b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/ec/525b2563b185cdb83b9747c1445ed915962806 new file mode 100644 index 0000000..9a8c56d Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/ec/525b2563b185cdb83b9747c1445ed915962806 differ diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/f2/afd032ea6ff5b079e802a3a3a2293470fd5d99 b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/f2/afd032ea6ff5b079e802a3a3a2293470fd5d99 new file mode 100644 index 0000000..5d18c25 --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/f2/afd032ea6ff5b079e802a3a3a2293470fd5d99 @@ -0,0 +1,2 @@ +x+)JMU016c040031QKM,/JKLgh;u~jn~b=ֹV@'LazfIbIIQfRiIj1xkΥ̝7e PH,J`?xHR_FC J,K֫*`81׺E}lܧK+~ՋCd&2rbb~(Z~xޖwP%ىzYy ==euX,_]{= )(-J+)M_}}߷f;IXHRv6TpױEXlUS$^{jlBPE`+/-,IMM+Kg.?[_o%*uQ z*/Nc# +# \ No newline at end of file diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/f3/c18941f5c1ccf57a8105ed7999c57a421b7596 b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/f3/c18941f5c1ccf57a8105ed7999c57a421b7596 new file mode 100644 index 0000000..a3bce83 Binary files /dev/null and b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/f3/c18941f5c1ccf57a8105ed7999c57a421b7596 differ diff --git a/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/f6/625c2a4e3dae97be16c5c33d2925c787327f82 b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/f6/625c2a4e3dae97be16c5c33d2925c787327f82 new file mode 100644 index 0000000..6f43bc4 --- /dev/null +++ b/.zprezto/_.git/modules/modules/prompt/functions/pure/objects/f6/625c2a4e3dae97be16c5c33d2925c787327f82 @@ -0,0 +1 @@ +xejC!E;+dX⣄P(tV(Kg g}B-%JƴN ɅFoP30%y.-^W8w|PFicW)%3K6uiw;7X͟|\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" + +# This example catches duplicate Signed-off-by lines. + +test "" = "$(grep '^Signed-off-by: ' "$1" | + sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { + echo >&2 Duplicate Signed-off-by lines. + exit 1 +} diff --git a/.zprezto/_.git/modules/modules/syntax-highlighting/external/hooks/post-update.sample b/.zprezto/_.git/modules/modules/syntax-highlighting/external/hooks/post-update.sample new file mode 100755 index 0000000..ec17ec1 --- /dev/null +++ b/.zprezto/_.git/modules/modules/syntax-highlighting/external/hooks/post-update.sample @@ -0,0 +1,8 @@ +#!/bin/sh +# +# An example hook script to prepare a packed repository for use over +# dumb transports. +# +# To enable this hook, rename this file to "post-update". + +exec git update-server-info diff --git a/.zprezto/_.git/modules/modules/syntax-highlighting/external/hooks/pre-applypatch.sample b/.zprezto/_.git/modules/modules/syntax-highlighting/external/hooks/pre-applypatch.sample new file mode 100755 index 0000000..b1f187c --- /dev/null +++ b/.zprezto/_.git/modules/modules/syntax-highlighting/external/hooks/pre-applypatch.sample @@ -0,0 +1,14 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed +# by applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-applypatch". + +. git-sh-setup +test -x "$GIT_DIR/hooks/pre-commit" && + exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"} +: diff --git a/.zprezto/_.git/modules/modules/syntax-highlighting/external/hooks/pre-commit.sample b/.zprezto/_.git/modules/modules/syntax-highlighting/external/hooks/pre-commit.sample new file mode 100755 index 0000000..68d62d5 --- /dev/null +++ b/.zprezto/_.git/modules/modules/syntax-highlighting/external/hooks/pre-commit.sample @@ -0,0 +1,49 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git commit" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message if +# it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-commit". + +if git rev-parse --verify HEAD >/dev/null 2>&1 +then + against=HEAD +else + # Initial commit: diff against an empty tree object + against=4b825dc642cb6eb9a060e54bf8d69288fbee4904 +fi + +# If you want to allow non-ASCII filenames set this variable to true. +allownonascii=$(git config --bool hooks.allownonascii) + +# Redirect output to stderr. +exec 1>&2 + +# Cross platform projects tend to avoid non-ASCII filenames; prevent +# them from being added to the repository. We exploit the fact that the +# printable range starts at the space character and ends with tilde. +if [ "$allownonascii" != "true" ] && + # Note that the use of brackets around a tr range is ok here, (it's + # even required, for portability to Solaris 10's /usr/bin/tr), since + # the square bracket bytes happen to fall in the designated range. + test $(git diff --cached --name-only --diff-filter=A -z $against | + LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 +then + cat <<\EOF +Error: Attempt to add a non-ASCII file name. + +This can cause problems if you want to work with people on other platforms. + +To be portable it is advisable to rename the file. + +If you know what you are doing you can disable this check using: + + git config hooks.allownonascii true +EOF + exit 1 +fi + +# If there are whitespace errors, print the offending file names and fail. +exec git diff-index --check --cached $against -- diff --git a/.zprezto/_.git/modules/modules/syntax-highlighting/external/hooks/pre-push.sample b/.zprezto/_.git/modules/modules/syntax-highlighting/external/hooks/pre-push.sample new file mode 100755 index 0000000..69e3c67 --- /dev/null +++ b/.zprezto/_.git/modules/modules/syntax-highlighting/external/hooks/pre-push.sample @@ -0,0 +1,54 @@ +#!/bin/sh + +# An example hook script to verify what is about to be pushed. Called by "git +# push" after it has checked the remote status, but before anything has been +# pushed. If this script exits with a non-zero status nothing will be pushed. +# +# This hook is called with the following parameters: +# +# $1 -- Name of the remote to which the push is being done +# $2 -- URL to which the push is being done +# +# If pushing without using a named remote those arguments will be equal. +# +# Information about the commits which are being pushed is supplied as lines to +# the standard input in the form: +# +# +# +# This sample shows how to prevent push of commits where the log message starts +# with "WIP" (work in progress). + +remote="$1" +url="$2" + +z40=0000000000000000000000000000000000000000 + +IFS=' ' +while read local_ref local_sha remote_ref remote_sha +do + if [ "$local_sha" = $z40 ] + then + # Handle delete + : + else + if [ "$remote_sha" = $z40 ] + then + # New branch, examine all commits + range="$local_sha" + else + # Update to existing branch, examine new commits + range="$remote_sha..$local_sha" + fi + + # Check for WIP commit + commit=`git rev-list -n 1 --grep '^WIP' "$range"` + if [ -n "$commit" ] + then + echo >&2 "Found WIP commit in $local_ref, not pushing" + exit 1 + fi + fi +done + +exit 0 diff --git a/.zprezto/_.git/modules/modules/syntax-highlighting/external/hooks/pre-rebase.sample b/.zprezto/_.git/modules/modules/syntax-highlighting/external/hooks/pre-rebase.sample new file mode 100755 index 0000000..9773ed4 --- /dev/null +++ b/.zprezto/_.git/modules/modules/syntax-highlighting/external/hooks/pre-rebase.sample @@ -0,0 +1,169 @@ +#!/bin/sh +# +# Copyright (c) 2006, 2008 Junio C Hamano +# +# The "pre-rebase" hook is run just before "git rebase" starts doing +# its job, and can prevent the command from running by exiting with +# non-zero status. +# +# The hook is called with the following parameters: +# +# $1 -- the upstream the series was forked from. +# $2 -- the branch being rebased (or empty when rebasing the current branch). +# +# This sample shows how to prevent topic branches that are already +# merged to 'next' branch from getting rebased, because allowing it +# would result in rebasing already published history. + +publish=next +basebranch="$1" +if test "$#" = 2 +then + topic="refs/heads/$2" +else + topic=`git symbolic-ref HEAD` || + exit 0 ;# we do not interrupt rebasing detached HEAD +fi + +case "$topic" in +refs/heads/??/*) + ;; +*) + exit 0 ;# we do not interrupt others. + ;; +esac + +# Now we are dealing with a topic branch being rebased +# on top of master. Is it OK to rebase it? + +# Does the topic really exist? +git show-ref -q "$topic" || { + echo >&2 "No such branch $topic" + exit 1 +} + +# Is topic fully merged to master? +not_in_master=`git rev-list --pretty=oneline ^master "$topic"` +if test -z "$not_in_master" +then + echo >&2 "$topic is fully merged to master; better remove it." + exit 1 ;# we could allow it, but there is no point. +fi + +# Is topic ever merged to next? If so you should not be rebasing it. +only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` +only_next_2=`git rev-list ^master ${publish} | sort` +if test "$only_next_1" = "$only_next_2" +then + not_in_topic=`git rev-list "^$topic" master` + if test -z "$not_in_topic" + then + echo >&2 "$topic is already up-to-date with master" + exit 1 ;# we could allow it, but there is no point. + else + exit 0 + fi +else + not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` + /usr/bin/perl -e ' + my $topic = $ARGV[0]; + my $msg = "* $topic has commits already merged to public branch:\n"; + my (%not_in_next) = map { + /^([0-9a-f]+) /; + ($1 => 1); + } split(/\n/, $ARGV[1]); + for my $elem (map { + /^([0-9a-f]+) (.*)$/; + [$1 => $2]; + } split(/\n/, $ARGV[2])) { + if (!exists $not_in_next{$elem->[0]}) { + if ($msg) { + print STDERR $msg; + undef $msg; + } + print STDERR " $elem->[1]\n"; + } + } + ' "$topic" "$not_in_next" "$not_in_master" + exit 1 +fi + +exit 0 + +################################################################ + +This sample hook safeguards topic branches that have been +published from being rewound. + +The workflow assumed here is: + + * Once a topic branch forks from "master", "master" is never + merged into it again (either directly or indirectly). + + * Once a topic branch is fully cooked and merged into "master", + it is deleted. If you need to build on top of it to correct + earlier mistakes, a new topic branch is created by forking at + the tip of the "master". This is not strictly necessary, but + it makes it easier to keep your history simple. + + * Whenever you need to test or publish your changes to topic + branches, merge them into "next" branch. + +The script, being an example, hardcodes the publish branch name +to be "next", but it is trivial to make it configurable via +$GIT_DIR/config mechanism. + +With this workflow, you would want to know: + +(1) ... if a topic branch has ever been merged to "next". Young + topic branches can have stupid mistakes you would rather + clean up before publishing, and things that have not been + merged into other branches can be easily rebased without + affecting other people. But once it is published, you would + not want to rewind it. + +(2) ... if a topic branch has been fully merged to "master". + Then you can delete it. More importantly, you should not + build on top of it -- other people may already want to + change things related to the topic as patches against your + "master", so if you need further changes, it is better to + fork the topic (perhaps with the same name) afresh from the + tip of "master". + +Let's look at this example: + + o---o---o---o---o---o---o---o---o---o "next" + / / / / + / a---a---b A / / + / / / / + / / c---c---c---c B / + / / / \ / + / / / b---b C \ / + / / / / \ / + ---o---o---o---o---o---o---o---o---o---o---o "master" + + +A, B and C are topic branches. + + * A has one fix since it was merged up to "next". + + * B has finished. It has been fully merged up to "master" and "next", + and is ready to be deleted. + + * C has not merged to "next" at all. + +We would want to allow C to be rebased, refuse A, and encourage +B to be deleted. + +To compute (1): + + git rev-list ^master ^topic next + git rev-list ^master next + + if these match, topic has not merged in next at all. + +To compute (2): + + git rev-list master..topic + + if this is empty, it is fully merged to "master". diff --git a/.zprezto/_.git/modules/modules/syntax-highlighting/external/hooks/prepare-commit-msg.sample b/.zprezto/_.git/modules/modules/syntax-highlighting/external/hooks/prepare-commit-msg.sample new file mode 100755 index 0000000..f093a02 --- /dev/null +++ b/.zprezto/_.git/modules/modules/syntax-highlighting/external/hooks/prepare-commit-msg.sample @@ -0,0 +1,36 @@ +#!/bin/sh +# +# An example hook script to prepare the commit log message. +# Called by "git commit" with the name of the file that has the +# commit message, followed by the description of the commit +# message's source. The hook's purpose is to edit the commit +# message file. If the hook fails with a non-zero status, +# the commit is aborted. +# +# To enable this hook, rename this file to "prepare-commit-msg". + +# This hook includes three examples. The first comments out the +# "Conflicts:" part of a merge commit. +# +# The second includes the output of "git diff --name-status -r" +# into the message, just before the "git status" output. It is +# commented because it doesn't cope with --amend or with squashed +# commits. +# +# The third example adds a Signed-off-by line to the message, that can +# still be edited. This is rarely a good idea. + +case "$2,$3" in + merge,) + /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;; + +# ,|template,) +# /usr/bin/perl -i.bak -pe ' +# print "\n" . `git diff --cached --name-status -r` +# if /^#/ && $first++ == 0' "$1" ;; + + *) ;; +esac + +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" diff --git a/.zprezto/_.git/modules/modules/syntax-highlighting/external/hooks/update.sample b/.zprezto/_.git/modules/modules/syntax-highlighting/external/hooks/update.sample new file mode 100755 index 0000000..d847583 --- /dev/null +++ b/.zprezto/_.git/modules/modules/syntax-highlighting/external/hooks/update.sample @@ -0,0 +1,128 @@ +#!/bin/sh +# +# An example hook script to blocks unannotated tags from entering. +# Called by "git receive-pack" with arguments: refname sha1-old sha1-new +# +# To enable this hook, rename this file to "update". +# +# Config +# ------ +# hooks.allowunannotated +# This boolean sets whether unannotated tags will be allowed into the +# repository. By default they won't be. +# hooks.allowdeletetag +# This boolean sets whether deleting tags will be allowed in the +# repository. By default they won't be. +# hooks.allowmodifytag +# This boolean sets whether a tag may be modified after creation. By default +# it won't be. +# hooks.allowdeletebranch +# This boolean sets whether deleting branches will be allowed in the +# repository. By default they won't be. +# hooks.denycreatebranch +# This boolean sets whether remotely creating branches will be denied +# in the repository. By default this is allowed. +# + +# --- Command line +refname="$1" +oldrev="$2" +newrev="$3" + +# --- Safety check +if [ -z "$GIT_DIR" ]; then + echo "Don't run this script from the command line." >&2 + echo " (if you want, you could supply GIT_DIR then run" >&2 + echo " $0 )" >&2 + exit 1 +fi + +if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then + echo "usage: $0 " >&2 + exit 1 +fi + +# --- Config +allowunannotated=$(git config --bool hooks.allowunannotated) +allowdeletebranch=$(git config --bool hooks.allowdeletebranch) +denycreatebranch=$(git config --bool hooks.denycreatebranch) +allowdeletetag=$(git config --bool hooks.allowdeletetag) +allowmodifytag=$(git config --bool hooks.allowmodifytag) + +# check for no description +projectdesc=$(sed -e '1q' "$GIT_DIR/description") +case "$projectdesc" in +"Unnamed repository"* | "") + echo "*** Project description file hasn't been set" >&2 + exit 1 + ;; +esac + +# --- Check types +# if $newrev is 0000...0000, it's a commit to delete a ref. +zero="0000000000000000000000000000000000000000" +if [ "$newrev" = "$zero" ]; then + newrev_type=delete +else + newrev_type=$(git cat-file -t $newrev) +fi + +case "$refname","$newrev_type" in + refs/tags/*,commit) + # un-annotated tag + short_refname=${refname##refs/tags/} + if [ "$allowunannotated" != "true" ]; then + echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2 + echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 + exit 1 + fi + ;; + refs/tags/*,delete) + # delete tag + if [ "$allowdeletetag" != "true" ]; then + echo "*** Deleting a tag is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/tags/*,tag) + # annotated tag + if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 + then + echo "*** Tag '$refname' already exists." >&2 + echo "*** Modifying a tag is not allowed in this repository." >&2 + exit 1 + fi + ;; + refs/heads/*,commit) + # branch + if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then + echo "*** Creating a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/heads/*,delete) + # delete branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/remotes/*,commit) + # tracking branch + ;; + refs/remotes/*,delete) + # delete tracking branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a tracking branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + *) + # Anything else (is there anything else?) + echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 + exit 1 + ;; +esac + +# --- Finished +exit 0 diff --git a/.zprezto/_.git/modules/modules/syntax-highlighting/external/index b/.zprezto/_.git/modules/modules/syntax-highlighting/external/index new file mode 100644 index 0000000..24784ac Binary files /dev/null and b/.zprezto/_.git/modules/modules/syntax-highlighting/external/index differ diff --git a/.zprezto/_.git/modules/modules/syntax-highlighting/external/info/exclude b/.zprezto/_.git/modules/modules/syntax-highlighting/external/info/exclude new file mode 100644 index 0000000..a5196d1 --- /dev/null +++ b/.zprezto/_.git/modules/modules/syntax-highlighting/external/info/exclude @@ -0,0 +1,6 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ diff --git a/.zprezto/_.git/modules/modules/syntax-highlighting/external/logs/HEAD b/.zprezto/_.git/modules/modules/syntax-highlighting/external/logs/HEAD new file mode 100644 index 0000000..f9c6c31 --- /dev/null +++ b/.zprezto/_.git/modules/modules/syntax-highlighting/external/logs/HEAD @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 e138cfd76526614b954f4c45c80e03b5c4a5e7be Abra 1443994579 +0400 clone: from https://github.com/zsh-users/zsh-syntax-highlighting.git +e138cfd76526614b954f4c45c80e03b5c4a5e7be 3dc574190071ef59054f6d693132410b37aa3ae4 Abra 1443994579 +0400 checkout: moving from master to 3dc574190071ef59054f6d693132410b37aa3ae4 +3dc574190071ef59054f6d693132410b37aa3ae4 44e5323b53edd221a79a585869cf4833d555ba58 Abra 1456189976 +0400 checkout: moving from 3dc574190071ef59054f6d693132410b37aa3ae4 to 44e5323b53edd221a79a585869cf4833d555ba58 diff --git a/.zprezto/_.git/modules/modules/syntax-highlighting/external/logs/refs/heads/master b/.zprezto/_.git/modules/modules/syntax-highlighting/external/logs/refs/heads/master new file mode 100644 index 0000000..7737d45 --- /dev/null +++ b/.zprezto/_.git/modules/modules/syntax-highlighting/external/logs/refs/heads/master @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 e138cfd76526614b954f4c45c80e03b5c4a5e7be Abra 1443994579 +0400 clone: from https://github.com/zsh-users/zsh-syntax-highlighting.git diff --git a/.zprezto/_.git/modules/modules/syntax-highlighting/external/logs/refs/remotes/origin/0.4.x b/.zprezto/_.git/modules/modules/syntax-highlighting/external/logs/refs/remotes/origin/0.4.x new file mode 100644 index 0000000..885fe9c --- /dev/null +++ b/.zprezto/_.git/modules/modules/syntax-highlighting/external/logs/refs/remotes/origin/0.4.x @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 7ac72a57bc7e5cc0ad84ef005d75c39d101b32a0 Abra 1456189968 +0400 pull: storing head diff --git a/.zprezto/_.git/modules/modules/syntax-highlighting/external/logs/refs/remotes/origin/HEAD b/.zprezto/_.git/modules/modules/syntax-highlighting/external/logs/refs/remotes/origin/HEAD new file mode 100644 index 0000000..7737d45 --- /dev/null +++ b/.zprezto/_.git/modules/modules/syntax-highlighting/external/logs/refs/remotes/origin/HEAD @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 e138cfd76526614b954f4c45c80e03b5c4a5e7be Abra 1443994579 +0400 clone: from https://github.com/zsh-users/zsh-syntax-highlighting.git diff --git a/.zprezto/_.git/modules/modules/syntax-highlighting/external/logs/refs/remotes/origin/master b/.zprezto/_.git/modules/modules/syntax-highlighting/external/logs/refs/remotes/origin/master new file mode 100644 index 0000000..56b867e --- /dev/null +++ b/.zprezto/_.git/modules/modules/syntax-highlighting/external/logs/refs/remotes/origin/master @@ -0,0 +1 @@ +e138cfd76526614b954f4c45c80e03b5c4a5e7be 7044c1986e2f6b15eec27a03651207fccb0a2fbe Abra 1456189968 +0400 pull: fast-forward diff --git a/.zprezto/_.git/modules/modules/syntax-highlighting/external/objects/pack/pack-41f4ec7c84bcf8255ff98f06eccb484bafcbd068.idx b/.zprezto/_.git/modules/modules/syntax-highlighting/external/objects/pack/pack-41f4ec7c84bcf8255ff98f06eccb484bafcbd068.idx new file mode 100644 index 0000000..cc03c8d Binary files /dev/null and b/.zprezto/_.git/modules/modules/syntax-highlighting/external/objects/pack/pack-41f4ec7c84bcf8255ff98f06eccb484bafcbd068.idx differ diff --git a/.zprezto/_.git/modules/modules/syntax-highlighting/external/objects/pack/pack-41f4ec7c84bcf8255ff98f06eccb484bafcbd068.pack b/.zprezto/_.git/modules/modules/syntax-highlighting/external/objects/pack/pack-41f4ec7c84bcf8255ff98f06eccb484bafcbd068.pack new file mode 100644 index 0000000..5368c24 Binary files /dev/null and b/.zprezto/_.git/modules/modules/syntax-highlighting/external/objects/pack/pack-41f4ec7c84bcf8255ff98f06eccb484bafcbd068.pack differ diff --git a/.zprezto/_.git/modules/modules/syntax-highlighting/external/objects/pack/pack-6a27b6cddf0d1234fe73b8b18427d9fd26cb89b7.idx b/.zprezto/_.git/modules/modules/syntax-highlighting/external/objects/pack/pack-6a27b6cddf0d1234fe73b8b18427d9fd26cb89b7.idx new file mode 100644 index 0000000..8bcd8db Binary files /dev/null and b/.zprezto/_.git/modules/modules/syntax-highlighting/external/objects/pack/pack-6a27b6cddf0d1234fe73b8b18427d9fd26cb89b7.idx differ diff --git a/.zprezto/_.git/modules/modules/syntax-highlighting/external/objects/pack/pack-6a27b6cddf0d1234fe73b8b18427d9fd26cb89b7.pack b/.zprezto/_.git/modules/modules/syntax-highlighting/external/objects/pack/pack-6a27b6cddf0d1234fe73b8b18427d9fd26cb89b7.pack new file mode 100644 index 0000000..9cdb83f Binary files /dev/null and b/.zprezto/_.git/modules/modules/syntax-highlighting/external/objects/pack/pack-6a27b6cddf0d1234fe73b8b18427d9fd26cb89b7.pack differ diff --git a/.zprezto/_.git/modules/modules/syntax-highlighting/external/packed-refs b/.zprezto/_.git/modules/modules/syntax-highlighting/external/packed-refs new file mode 100644 index 0000000..cc767e8 --- /dev/null +++ b/.zprezto/_.git/modules/modules/syntax-highlighting/external/packed-refs @@ -0,0 +1,8 @@ +# pack-refs with: peeled fully-peeled +e138cfd76526614b954f4c45c80e03b5c4a5e7be refs/remotes/origin/master +d2715e2cb3294880bbc6a75b91288243054218d0 refs/tags/0.1.0 +bb0d575942760fe483790fe878ea43b1f781e2ca refs/tags/0.1.1 +732b7d6e65c0349ee1d89b698bf9cd8a30c1015d refs/tags/0.1.2 +a0862053f57e3d8d6e0dbc34e55be13d9e4fb668 refs/tags/0.1.3 +dbd27cb30a710809dd070669c331574fdc15b397 refs/tags/0.2.0 +3dc574190071ef59054f6d693132410b37aa3ae4 refs/tags/0.2.1 diff --git a/.zprezto/_.git/modules/modules/syntax-highlighting/external/refs/heads/master b/.zprezto/_.git/modules/modules/syntax-highlighting/external/refs/heads/master new file mode 100644 index 0000000..42105f9 --- /dev/null +++ b/.zprezto/_.git/modules/modules/syntax-highlighting/external/refs/heads/master @@ -0,0 +1 @@ +e138cfd76526614b954f4c45c80e03b5c4a5e7be diff --git a/.zprezto/_.git/modules/modules/syntax-highlighting/external/refs/remotes/origin/0.4.x b/.zprezto/_.git/modules/modules/syntax-highlighting/external/refs/remotes/origin/0.4.x new file mode 100644 index 0000000..da67951 --- /dev/null +++ b/.zprezto/_.git/modules/modules/syntax-highlighting/external/refs/remotes/origin/0.4.x @@ -0,0 +1 @@ +7ac72a57bc7e5cc0ad84ef005d75c39d101b32a0 diff --git a/.zprezto/_.git/modules/modules/syntax-highlighting/external/refs/remotes/origin/HEAD b/.zprezto/_.git/modules/modules/syntax-highlighting/external/refs/remotes/origin/HEAD new file mode 100644 index 0000000..6efe28f --- /dev/null +++ b/.zprezto/_.git/modules/modules/syntax-highlighting/external/refs/remotes/origin/HEAD @@ -0,0 +1 @@ +ref: refs/remotes/origin/master diff --git a/.zprezto/_.git/modules/modules/syntax-highlighting/external/refs/remotes/origin/master b/.zprezto/_.git/modules/modules/syntax-highlighting/external/refs/remotes/origin/master new file mode 100644 index 0000000..aaf2308 --- /dev/null +++ b/.zprezto/_.git/modules/modules/syntax-highlighting/external/refs/remotes/origin/master @@ -0,0 +1 @@ +7044c1986e2f6b15eec27a03651207fccb0a2fbe diff --git a/.zprezto/_.git/modules/modules/syntax-highlighting/external/refs/tags/0.3.0 b/.zprezto/_.git/modules/modules/syntax-highlighting/external/refs/tags/0.3.0 new file mode 100644 index 0000000..fd8a04c --- /dev/null +++ b/.zprezto/_.git/modules/modules/syntax-highlighting/external/refs/tags/0.3.0 @@ -0,0 +1 @@ +fee52920ae0b29e30bf5413151263faed20f5123 diff --git a/.zprezto/_.git/modules/modules/syntax-highlighting/external/refs/tags/0.4.0 b/.zprezto/_.git/modules/modules/syntax-highlighting/external/refs/tags/0.4.0 new file mode 100644 index 0000000..7ba7555 --- /dev/null +++ b/.zprezto/_.git/modules/modules/syntax-highlighting/external/refs/tags/0.4.0 @@ -0,0 +1 @@ +2d792b03bb715b1cd4c550aba48e2ca10be6a447 diff --git a/.zprezto/_.git/modules/modules/syntax-highlighting/external/refs/tags/0.4.1 b/.zprezto/_.git/modules/modules/syntax-highlighting/external/refs/tags/0.4.1 new file mode 100644 index 0000000..b31db69 --- /dev/null +++ b/.zprezto/_.git/modules/modules/syntax-highlighting/external/refs/tags/0.4.1 @@ -0,0 +1 @@ +c19ee583138ebab416b0d2efafbad7dc9f3f7c4f diff --git a/.zprezto/_.git/objects/02/b3d329acdef10c145a1068e9f2a419d8104444 b/.zprezto/_.git/objects/02/b3d329acdef10c145a1068e9f2a419d8104444 new file mode 100644 index 0000000..b0e8955 --- /dev/null +++ b/.zprezto/_.git/objects/02/b3d329acdef10c145a1068e9f2a419d8104444 @@ -0,0 +1,4 @@ +x5J1E}ޯL$ EX_d.t͢{#9p7ehw@$6t4.%RBCZ3JN؎4bIE +^(+ <} +[TWʇq],(2HC[ +^K5n}K/ rѡ'ZS>Rv8ߎ?VM@ \ No newline at end of file diff --git a/.zprezto/_.git/objects/02/d52a32768976f6b3e7217b14702505e61bf91d b/.zprezto/_.git/objects/02/d52a32768976f6b3e7217b14702505e61bf91d new file mode 100644 index 0000000..06a00bd Binary files /dev/null and b/.zprezto/_.git/objects/02/d52a32768976f6b3e7217b14702505e61bf91d differ diff --git a/.zprezto/_.git/objects/08/a794b00de1863dd9e03e088e8b8ff29cdf46eb b/.zprezto/_.git/objects/08/a794b00de1863dd9e03e088e8b8ff29cdf46eb new file mode 100644 index 0000000..5f00e26 Binary files /dev/null and b/.zprezto/_.git/objects/08/a794b00de1863dd9e03e088e8b8ff29cdf46eb differ diff --git a/.zprezto/_.git/objects/0c/3fbf0f510802f080965b7efb32d1e6a50e39bd b/.zprezto/_.git/objects/0c/3fbf0f510802f080965b7efb32d1e6a50e39bd new file mode 100644 index 0000000..ab5f886 Binary files /dev/null and b/.zprezto/_.git/objects/0c/3fbf0f510802f080965b7efb32d1e6a50e39bd differ diff --git a/.zprezto/_.git/objects/16/5879d4b30dbf90d436b02a73786a28519d9e93 b/.zprezto/_.git/objects/16/5879d4b30dbf90d436b02a73786a28519d9e93 new file mode 100644 index 0000000..be899d2 Binary files /dev/null and b/.zprezto/_.git/objects/16/5879d4b30dbf90d436b02a73786a28519d9e93 differ diff --git a/.zprezto/_.git/objects/19/2ccb5aa9cbae57517be67f2d1b1d9c9a8a3d63 b/.zprezto/_.git/objects/19/2ccb5aa9cbae57517be67f2d1b1d9c9a8a3d63 new file mode 100644 index 0000000..02f6820 Binary files /dev/null and b/.zprezto/_.git/objects/19/2ccb5aa9cbae57517be67f2d1b1d9c9a8a3d63 differ diff --git a/.zprezto/_.git/objects/1b/418df1f5ec6581cf01775746ac266f1b7739ce b/.zprezto/_.git/objects/1b/418df1f5ec6581cf01775746ac266f1b7739ce new file mode 100644 index 0000000..be7e9a9 Binary files /dev/null and b/.zprezto/_.git/objects/1b/418df1f5ec6581cf01775746ac266f1b7739ce differ diff --git a/.zprezto/_.git/objects/1c/3372e36ea52d7c34405ebb53ad70eb8fed4400 b/.zprezto/_.git/objects/1c/3372e36ea52d7c34405ebb53ad70eb8fed4400 new file mode 100644 index 0000000..6855db7 Binary files /dev/null and b/.zprezto/_.git/objects/1c/3372e36ea52d7c34405ebb53ad70eb8fed4400 differ diff --git a/.zprezto/_.git/objects/20/715f56fa37a117bc91d49187fc6f6633ee5287 b/.zprezto/_.git/objects/20/715f56fa37a117bc91d49187fc6f6633ee5287 new file mode 100644 index 0000000..ab4b1d0 Binary files /dev/null and b/.zprezto/_.git/objects/20/715f56fa37a117bc91d49187fc6f6633ee5287 differ diff --git a/.zprezto/_.git/objects/24/02a434a8c03d8ffdbbf0b601e1f8cd11817aa4 b/.zprezto/_.git/objects/24/02a434a8c03d8ffdbbf0b601e1f8cd11817aa4 new file mode 100644 index 0000000..33e1f5f Binary files /dev/null and b/.zprezto/_.git/objects/24/02a434a8c03d8ffdbbf0b601e1f8cd11817aa4 differ diff --git a/.zprezto/_.git/objects/29/c80300d04d55feafa5188c48ea2aea56fec1de b/.zprezto/_.git/objects/29/c80300d04d55feafa5188c48ea2aea56fec1de new file mode 100644 index 0000000..8e7a4a0 Binary files /dev/null and b/.zprezto/_.git/objects/29/c80300d04d55feafa5188c48ea2aea56fec1de differ diff --git a/.zprezto/_.git/objects/2a/622ce67801e35a078740852576f67e1dc0519f b/.zprezto/_.git/objects/2a/622ce67801e35a078740852576f67e1dc0519f new file mode 100644 index 0000000..2e066c6 Binary files /dev/null and b/.zprezto/_.git/objects/2a/622ce67801e35a078740852576f67e1dc0519f differ diff --git a/.zprezto/_.git/objects/2a/d1b2f5b1f5997f9473b1f8705ab8d000d51600 b/.zprezto/_.git/objects/2a/d1b2f5b1f5997f9473b1f8705ab8d000d51600 new file mode 100644 index 0000000..872f37e --- /dev/null +++ b/.zprezto/_.git/objects/2a/d1b2f5b1f5997f9473b1f8705ab8d000d51600 @@ -0,0 +1 @@ +xUAj0E)%K,Ji(tQ RdzѳWi(7LgCB/T-QY5jcQ^IʔD#EG3hiQycșRpEhHGF jFcW8c^gi#lKʄ%HG lBt^,M7Yܝfο!TCA^FЈ5M)w(>l<6BW]hdOSUA pW2a8Deuw \ No newline at end of file diff --git a/.zprezto/_.git/objects/2e/6c0e2826862bd72abdde6d9a0ec1457f652791 b/.zprezto/_.git/objects/2e/6c0e2826862bd72abdde6d9a0ec1457f652791 new file mode 100644 index 0000000..a0d726a Binary files /dev/null and b/.zprezto/_.git/objects/2e/6c0e2826862bd72abdde6d9a0ec1457f652791 differ diff --git a/.zprezto/_.git/objects/2f/e7442d07ae2bb9b82b15c819e30c0de6ef4d31 b/.zprezto/_.git/objects/2f/e7442d07ae2bb9b82b15c819e30c0de6ef4d31 new file mode 100644 index 0000000..887ed41 Binary files /dev/null and b/.zprezto/_.git/objects/2f/e7442d07ae2bb9b82b15c819e30c0de6ef4d31 differ diff --git a/.zprezto/_.git/objects/34/528e1e55d9f73fe6a0e7b67d1a8cface0ec98a b/.zprezto/_.git/objects/34/528e1e55d9f73fe6a0e7b67d1a8cface0ec98a new file mode 100644 index 0000000..c3021b1 Binary files /dev/null and b/.zprezto/_.git/objects/34/528e1e55d9f73fe6a0e7b67d1a8cface0ec98a differ diff --git a/.zprezto/_.git/objects/38/baf39513ff76379931db5bee0f2db2b8b0e93c b/.zprezto/_.git/objects/38/baf39513ff76379931db5bee0f2db2b8b0e93c new file mode 100644 index 0000000..ec30cfd --- /dev/null +++ b/.zprezto/_.git/objects/38/baf39513ff76379931db5bee0f2db2b8b0e93c @@ -0,0 +1 @@ +x;n0S{?Һr]r#HAQ#xżb0k頝;3 `_GRyHٰeɋ w8S@k >%$)*1kb{m/np=R^5XKj':7i{v~C!~dzv| s\/uW \ No newline at end of file diff --git a/.zprezto/_.git/objects/3f/0cf3e2fcdd90d17f7c6fde4c6463b10da6d9db b/.zprezto/_.git/objects/3f/0cf3e2fcdd90d17f7c6fde4c6463b10da6d9db new file mode 100644 index 0000000..8bbb77d Binary files /dev/null and b/.zprezto/_.git/objects/3f/0cf3e2fcdd90d17f7c6fde4c6463b10da6d9db differ diff --git a/.zprezto/_.git/objects/42/cc19de8a22408b28a5403885432b5ebfcdcd11 b/.zprezto/_.git/objects/42/cc19de8a22408b28a5403885432b5ebfcdcd11 new file mode 100644 index 0000000..3ba50b0 Binary files /dev/null and b/.zprezto/_.git/objects/42/cc19de8a22408b28a5403885432b5ebfcdcd11 differ diff --git a/.zprezto/_.git/objects/43/133fd716f330ea59d46dcdf1f69d19879883c6 b/.zprezto/_.git/objects/43/133fd716f330ea59d46dcdf1f69d19879883c6 new file mode 100644 index 0000000..3802154 Binary files /dev/null and b/.zprezto/_.git/objects/43/133fd716f330ea59d46dcdf1f69d19879883c6 differ diff --git a/.zprezto/_.git/objects/45/2316ab4f706a1bcfc3295f2536e2839e89cc38 b/.zprezto/_.git/objects/45/2316ab4f706a1bcfc3295f2536e2839e89cc38 new file mode 100644 index 0000000..143193c Binary files /dev/null and b/.zprezto/_.git/objects/45/2316ab4f706a1bcfc3295f2536e2839e89cc38 differ diff --git a/.zprezto/_.git/objects/48/4b4ebe12f95fb5e8eff1dfae8c06f496d78ec2 b/.zprezto/_.git/objects/48/4b4ebe12f95fb5e8eff1dfae8c06f496d78ec2 new file mode 100644 index 0000000..4e33236 Binary files /dev/null and b/.zprezto/_.git/objects/48/4b4ebe12f95fb5e8eff1dfae8c06f496d78ec2 differ diff --git a/.zprezto/_.git/objects/4c/d7c21f77d2e4b0f2e16f9f573bfabb6e94e519 b/.zprezto/_.git/objects/4c/d7c21f77d2e4b0f2e16f9f573bfabb6e94e519 new file mode 100644 index 0000000..7eac947 Binary files /dev/null and b/.zprezto/_.git/objects/4c/d7c21f77d2e4b0f2e16f9f573bfabb6e94e519 differ diff --git a/.zprezto/_.git/objects/4e/1c74883470c94be71c865e75f25289719da052 b/.zprezto/_.git/objects/4e/1c74883470c94be71c865e75f25289719da052 new file mode 100644 index 0000000..abb4034 Binary files /dev/null and b/.zprezto/_.git/objects/4e/1c74883470c94be71c865e75f25289719da052 differ diff --git a/.zprezto/_.git/objects/4f/19700919c8ebbaf75755fc0d03716d13183f49 b/.zprezto/_.git/objects/4f/19700919c8ebbaf75755fc0d03716d13183f49 new file mode 100644 index 0000000..c394050 --- /dev/null +++ b/.zprezto/_.git/objects/4f/19700919c8ebbaf75755fc0d03716d13183f49 @@ -0,0 +1,3 @@ +xMj!uk!$ˬs*QC1[|J_ &ɘ PGmt֙MI +6N⺭+32)4jIBIY vFf";݄T \ No newline at end of file diff --git a/.zprezto/_.git/objects/50/d3b2cac3be56a49cf750ccd2f7426deb914257 b/.zprezto/_.git/objects/50/d3b2cac3be56a49cf750ccd2f7426deb914257 new file mode 100644 index 0000000..7223566 Binary files /dev/null and b/.zprezto/_.git/objects/50/d3b2cac3be56a49cf750ccd2f7426deb914257 differ diff --git a/.zprezto/_.git/objects/51/8a2795f4121ac9b05cf5d7c246a53f126dcd22 b/.zprezto/_.git/objects/51/8a2795f4121ac9b05cf5d7c246a53f126dcd22 new file mode 100644 index 0000000..d8a7e86 Binary files /dev/null and b/.zprezto/_.git/objects/51/8a2795f4121ac9b05cf5d7c246a53f126dcd22 differ diff --git a/.zprezto/_.git/objects/53/28f0a021643b52c4e4549db5a70811e5ab4c7b b/.zprezto/_.git/objects/53/28f0a021643b52c4e4549db5a70811e5ab4c7b new file mode 100644 index 0000000..467da6b Binary files /dev/null and b/.zprezto/_.git/objects/53/28f0a021643b52c4e4549db5a70811e5ab4c7b differ diff --git a/.zprezto/_.git/objects/53/a09a172b2f5cdaa1389ed3bcc44f112805f421 b/.zprezto/_.git/objects/53/a09a172b2f5cdaa1389ed3bcc44f112805f421 new file mode 100644 index 0000000..35f2f44 Binary files /dev/null and b/.zprezto/_.git/objects/53/a09a172b2f5cdaa1389ed3bcc44f112805f421 differ diff --git a/.zprezto/_.git/objects/56/ce23800b1cd96d61a4577b850b5b139066949c b/.zprezto/_.git/objects/56/ce23800b1cd96d61a4577b850b5b139066949c new file mode 100644 index 0000000..e1c0fff Binary files /dev/null and b/.zprezto/_.git/objects/56/ce23800b1cd96d61a4577b850b5b139066949c differ diff --git a/.zprezto/_.git/objects/62/94261fba50ce9b39bd073cdf4b978770d3878e b/.zprezto/_.git/objects/62/94261fba50ce9b39bd073cdf4b978770d3878e new file mode 100644 index 0000000..460629a Binary files /dev/null and b/.zprezto/_.git/objects/62/94261fba50ce9b39bd073cdf4b978770d3878e differ diff --git a/.zprezto/_.git/objects/63/0516a293360169e742e7086e28172d05992f26 b/.zprezto/_.git/objects/63/0516a293360169e742e7086e28172d05992f26 new file mode 100644 index 0000000..df4dce1 Binary files /dev/null and b/.zprezto/_.git/objects/63/0516a293360169e742e7086e28172d05992f26 differ diff --git a/.zprezto/_.git/objects/64/aa907087e0f7aff5f499d8ccebc6526f8870f0 b/.zprezto/_.git/objects/64/aa907087e0f7aff5f499d8ccebc6526f8870f0 new file mode 100644 index 0000000..3ad43d0 --- /dev/null +++ b/.zprezto/_.git/objects/64/aa907087e0f7aff5f499d8ccebc6526f8870f0 @@ -0,0 +1 @@ +xAj0E) <#BY`,ϴ29~z._sY'0kOR\0Y}7*%lZ!z3DIKL1rdm ?oQi{YObt 6k!UUE̐@䬇\Dt$JxPm2XiDsDuh0ۃn( +~ @KPM \ No newline at end of file diff --git a/.zprezto/_.git/objects/a9/91dc02cde6eeffca93ec07abe43f9a5cab561b b/.zprezto/_.git/objects/a9/91dc02cde6eeffca93ec07abe43f9a5cab561b new file mode 100644 index 0000000..20a0152 Binary files /dev/null and b/.zprezto/_.git/objects/a9/91dc02cde6eeffca93ec07abe43f9a5cab561b differ diff --git a/.zprezto/_.git/objects/aa/f95a425891134baef086480a2a493df58a4b4e b/.zprezto/_.git/objects/aa/f95a425891134baef086480a2a493df58a4b4e new file mode 100644 index 0000000..425f570 Binary files /dev/null and b/.zprezto/_.git/objects/aa/f95a425891134baef086480a2a493df58a4b4e differ diff --git a/.zprezto/_.git/objects/b5/903835aa6d66e39db5751aaa2b9653551aed25 b/.zprezto/_.git/objects/b5/903835aa6d66e39db5751aaa2b9653551aed25 new file mode 100644 index 0000000..9a32158 Binary files /dev/null and b/.zprezto/_.git/objects/b5/903835aa6d66e39db5751aaa2b9653551aed25 differ diff --git a/.zprezto/_.git/objects/b9/69c7a5535fe1963d651c8f41b9a58b9e04ed58 b/.zprezto/_.git/objects/b9/69c7a5535fe1963d651c8f41b9a58b9e04ed58 new file mode 100644 index 0000000..01591a2 Binary files /dev/null and b/.zprezto/_.git/objects/b9/69c7a5535fe1963d651c8f41b9a58b9e04ed58 differ diff --git a/.zprezto/_.git/objects/b9/737307d2ed4137e7c60fbfb29e7b5d48190aad b/.zprezto/_.git/objects/b9/737307d2ed4137e7c60fbfb29e7b5d48190aad new file mode 100644 index 0000000..da60be5 Binary files /dev/null and b/.zprezto/_.git/objects/b9/737307d2ed4137e7c60fbfb29e7b5d48190aad differ diff --git a/.zprezto/_.git/objects/b9/c28b4c9f128376356e642e297eca39de82c321 b/.zprezto/_.git/objects/b9/c28b4c9f128376356e642e297eca39de82c321 new file mode 100644 index 0000000..c891334 Binary files /dev/null and b/.zprezto/_.git/objects/b9/c28b4c9f128376356e642e297eca39de82c321 differ diff --git a/.zprezto/_.git/objects/bb/f1c923b6673adf5a5137a9013204cf22065cc0 b/.zprezto/_.git/objects/bb/f1c923b6673adf5a5137a9013204cf22065cc0 new file mode 100644 index 0000000..32a815d Binary files /dev/null and b/.zprezto/_.git/objects/bb/f1c923b6673adf5a5137a9013204cf22065cc0 differ diff --git a/.zprezto/_.git/objects/be/0e1ab96441030731d065ff4b9fc8b1e4ae2ce3 b/.zprezto/_.git/objects/be/0e1ab96441030731d065ff4b9fc8b1e4ae2ce3 new file mode 100644 index 0000000..ae7944c Binary files /dev/null and b/.zprezto/_.git/objects/be/0e1ab96441030731d065ff4b9fc8b1e4ae2ce3 differ diff --git a/.zprezto/_.git/objects/c0/5fbedd8d6eeb998af58fd947c5424caf797ebd b/.zprezto/_.git/objects/c0/5fbedd8d6eeb998af58fd947c5424caf797ebd new file mode 100644 index 0000000..744f988 --- /dev/null +++ b/.zprezto/_.git/objects/c0/5fbedd8d6eeb998af58fd947c5424caf797ebd @@ -0,0 +1,3 @@ +xAn E)00I޾T=B-\=wο* ':y6*PJbIJMOrtxj J0ʱ‰ξ +!O_?|.+,zz5+ +ްh$g. _#szs;c}nB Xc \ No newline at end of file diff --git a/.zprezto/_.git/objects/c1/ef2f77139dd2f0588028f4d74c4fcc771cc753 b/.zprezto/_.git/objects/c1/ef2f77139dd2f0588028f4d74c4fcc771cc753 new file mode 100644 index 0000000..eba6132 Binary files /dev/null and b/.zprezto/_.git/objects/c1/ef2f77139dd2f0588028f4d74c4fcc771cc753 differ diff --git a/.zprezto/_.git/objects/c2/0e36ec81cb3e84e42de7cb820e742604883e3d b/.zprezto/_.git/objects/c2/0e36ec81cb3e84e42de7cb820e742604883e3d new file mode 100644 index 0000000..dc74965 Binary files /dev/null and b/.zprezto/_.git/objects/c2/0e36ec81cb3e84e42de7cb820e742604883e3d differ diff --git a/.zprezto/_.git/objects/c2/75579fb00f3010d8f2e2ad63248e0e303bf6af b/.zprezto/_.git/objects/c2/75579fb00f3010d8f2e2ad63248e0e303bf6af new file mode 100644 index 0000000..c278207 Binary files /dev/null and b/.zprezto/_.git/objects/c2/75579fb00f3010d8f2e2ad63248e0e303bf6af differ diff --git a/.zprezto/_.git/objects/c4/b3072c37dd61dd0342eabb0e72c7eb6516b99d b/.zprezto/_.git/objects/c4/b3072c37dd61dd0342eabb0e72c7eb6516b99d new file mode 100644 index 0000000..a91fa88 Binary files /dev/null and b/.zprezto/_.git/objects/c4/b3072c37dd61dd0342eabb0e72c7eb6516b99d differ diff --git a/.zprezto/_.git/objects/c8/b8397728ee9ed19315f96aa2f149a4a4a183b2 b/.zprezto/_.git/objects/c8/b8397728ee9ed19315f96aa2f149a4a4a183b2 new file mode 100644 index 0000000..cea5206 Binary files /dev/null and b/.zprezto/_.git/objects/c8/b8397728ee9ed19315f96aa2f149a4a4a183b2 differ diff --git a/.zprezto/_.git/objects/c9/141074a30de140125e08b65c71832f916f7a35 b/.zprezto/_.git/objects/c9/141074a30de140125e08b65c71832f916f7a35 new file mode 100644 index 0000000..e478785 --- /dev/null +++ b/.zprezto/_.git/objects/c9/141074a30de140125e08b65c71832f916f7a35 @@ -0,0 +1 @@ +x]K@=xMKC"-؃ԓfݰҏY*zy{f]ꤟ1"<1m[eJh6,|+$㡔uL!7ۢ޷VM!x WPZ4CUi/"Ax01&(/X:LY$Ѷ]Mb!2v^9:pG$f`ݦh6 y;/Tкl: 9ȻbSl\^x/cdRY/y \ No newline at end of file diff --git a/.zprezto/_.git/objects/cc/1e8fe9d1b8038a7a6a869e11eb5b79e30e3894 b/.zprezto/_.git/objects/cc/1e8fe9d1b8038a7a6a869e11eb5b79e30e3894 new file mode 100644 index 0000000..f9a5360 Binary files /dev/null and b/.zprezto/_.git/objects/cc/1e8fe9d1b8038a7a6a869e11eb5b79e30e3894 differ diff --git a/.zprezto/_.git/objects/d8/f456648fd71170b3e001a50fd72e205a5d60eb b/.zprezto/_.git/objects/d8/f456648fd71170b3e001a50fd72e205a5d60eb new file mode 100644 index 0000000..01f4ba5 Binary files /dev/null and b/.zprezto/_.git/objects/d8/f456648fd71170b3e001a50fd72e205a5d60eb differ diff --git a/.zprezto/_.git/objects/d9/841e206a24599835a25814076a6efb8ae94f4d b/.zprezto/_.git/objects/d9/841e206a24599835a25814076a6efb8ae94f4d new file mode 100644 index 0000000..8494350 Binary files /dev/null and b/.zprezto/_.git/objects/d9/841e206a24599835a25814076a6efb8ae94f4d differ diff --git a/.zprezto/_.git/objects/da/1ce1d6fedd241ff31aacc9b7dba916a434ee98 b/.zprezto/_.git/objects/da/1ce1d6fedd241ff31aacc9b7dba916a434ee98 new file mode 100644 index 0000000..1a74de1 Binary files /dev/null and b/.zprezto/_.git/objects/da/1ce1d6fedd241ff31aacc9b7dba916a434ee98 differ diff --git a/.zprezto/_.git/objects/db/851f36955b548653bcbca47a672afba50b6bcf b/.zprezto/_.git/objects/db/851f36955b548653bcbca47a672afba50b6bcf new file mode 100644 index 0000000..7257506 Binary files /dev/null and b/.zprezto/_.git/objects/db/851f36955b548653bcbca47a672afba50b6bcf differ diff --git a/.zprezto/_.git/objects/de/9ed0610b1cc2c5aadc0eac8c59add0b2f6d118 b/.zprezto/_.git/objects/de/9ed0610b1cc2c5aadc0eac8c59add0b2f6d118 new file mode 100644 index 0000000..85f14e8 Binary files /dev/null and b/.zprezto/_.git/objects/de/9ed0610b1cc2c5aadc0eac8c59add0b2f6d118 differ diff --git a/.zprezto/_.git/objects/e1/37068cacfc42eb96c8e0e58855d7d1c5c06c05 b/.zprezto/_.git/objects/e1/37068cacfc42eb96c8e0e58855d7d1c5c06c05 new file mode 100644 index 0000000..0b227b2 Binary files /dev/null and b/.zprezto/_.git/objects/e1/37068cacfc42eb96c8e0e58855d7d1c5c06c05 differ diff --git a/.zprezto/_.git/objects/e3/6eed9c8a55d687ccb7b0b91bd9d2bee9854ac2 b/.zprezto/_.git/objects/e3/6eed9c8a55d687ccb7b0b91bd9d2bee9854ac2 new file mode 100644 index 0000000..1eaa2d1 Binary files /dev/null and b/.zprezto/_.git/objects/e3/6eed9c8a55d687ccb7b0b91bd9d2bee9854ac2 differ diff --git a/.zprezto/_.git/objects/e3/ddd31b87df1a4c539cb63b047d110de4f02f8d b/.zprezto/_.git/objects/e3/ddd31b87df1a4c539cb63b047d110de4f02f8d new file mode 100644 index 0000000..3fc041b Binary files /dev/null and b/.zprezto/_.git/objects/e3/ddd31b87df1a4c539cb63b047d110de4f02f8d differ diff --git a/.zprezto/_.git/objects/e6/41c2111a40e8f8e4ca581eba240b8457c2e7bb b/.zprezto/_.git/objects/e6/41c2111a40e8f8e4ca581eba240b8457c2e7bb new file mode 100644 index 0000000..9553825 Binary files /dev/null and b/.zprezto/_.git/objects/e6/41c2111a40e8f8e4ca581eba240b8457c2e7bb differ diff --git a/.zprezto/_.git/objects/e8/cd8d066a9dd66affdfaa239f8eb6a3411b24ec b/.zprezto/_.git/objects/e8/cd8d066a9dd66affdfaa239f8eb6a3411b24ec new file mode 100644 index 0000000..a720690 Binary files /dev/null and b/.zprezto/_.git/objects/e8/cd8d066a9dd66affdfaa239f8eb6a3411b24ec differ diff --git a/.zprezto/_.git/objects/e9/3ac6bf74d9bf494e122c08676c952a759a4abd b/.zprezto/_.git/objects/e9/3ac6bf74d9bf494e122c08676c952a759a4abd new file mode 100644 index 0000000..5064adf Binary files /dev/null and b/.zprezto/_.git/objects/e9/3ac6bf74d9bf494e122c08676c952a759a4abd differ diff --git a/.zprezto/_.git/objects/ef/60ce5dd6f18fca3bb49a897250e075ded71180 b/.zprezto/_.git/objects/ef/60ce5dd6f18fca3bb49a897250e075ded71180 new file mode 100644 index 0000000..76843e2 --- /dev/null +++ b/.zprezto/_.git/objects/ef/60ce5dd6f18fca3bb49a897250e075ded71180 @@ -0,0 +1 @@ +xAn D)U~ LjC0IG,ӗ &p[S-DBOftȘ8'Љ,Jo!*t!a IavXh@!y Hj.zƄޙ%矒AY1)(5(VNi+Bm]e og (|/yvW&'k-kjZ_vThe<[Mpk< V?[~p G/V{ \ No newline at end of file diff --git a/.zprezto/_.git/objects/ef/c45b5bdf4784bf41c20c363964944b6be65145 b/.zprezto/_.git/objects/ef/c45b5bdf4784bf41c20c363964944b6be65145 new file mode 100644 index 0000000..787c83e Binary files /dev/null and b/.zprezto/_.git/objects/ef/c45b5bdf4784bf41c20c363964944b6be65145 differ diff --git a/.zprezto/_.git/objects/f1/be47409e5cb022621e229b7bf2076e6e0154bc b/.zprezto/_.git/objects/f1/be47409e5cb022621e229b7bf2076e6e0154bc new file mode 100644 index 0000000..cd03335 Binary files /dev/null and b/.zprezto/_.git/objects/f1/be47409e5cb022621e229b7bf2076e6e0154bc differ diff --git a/.zprezto/_.git/objects/f6/530ce7d3d3df30433c33a1120264dc1b718dce b/.zprezto/_.git/objects/f6/530ce7d3d3df30433c33a1120264dc1b718dce new file mode 100644 index 0000000..c17d25b Binary files /dev/null and b/.zprezto/_.git/objects/f6/530ce7d3d3df30433c33a1120264dc1b718dce differ diff --git a/.zprezto/_.git/objects/f8/08149909822099ada61a21b4edc4511229f928 b/.zprezto/_.git/objects/f8/08149909822099ada61a21b4edc4511229f928 new file mode 100644 index 0000000..16cf655 Binary files /dev/null and b/.zprezto/_.git/objects/f8/08149909822099ada61a21b4edc4511229f928 differ diff --git a/.zprezto/_.git/objects/fa/944da8d806eb04194badf2026940a9e1fdc0ff b/.zprezto/_.git/objects/fa/944da8d806eb04194badf2026940a9e1fdc0ff new file mode 100644 index 0000000..e72e7d8 Binary files /dev/null and b/.zprezto/_.git/objects/fa/944da8d806eb04194badf2026940a9e1fdc0ff differ diff --git a/.zprezto/_.git/objects/pack/pack-bb0454569728143b520380ca414bc330b9fe4af9.idx b/.zprezto/_.git/objects/pack/pack-bb0454569728143b520380ca414bc330b9fe4af9.idx new file mode 100644 index 0000000..c331f75 Binary files /dev/null and b/.zprezto/_.git/objects/pack/pack-bb0454569728143b520380ca414bc330b9fe4af9.idx differ diff --git a/.zprezto/_.git/objects/pack/pack-bb0454569728143b520380ca414bc330b9fe4af9.pack b/.zprezto/_.git/objects/pack/pack-bb0454569728143b520380ca414bc330b9fe4af9.pack new file mode 100644 index 0000000..9e1b118 Binary files /dev/null and b/.zprezto/_.git/objects/pack/pack-bb0454569728143b520380ca414bc330b9fe4af9.pack differ diff --git a/.zprezto/_.git/packed-refs b/.zprezto/_.git/packed-refs new file mode 100644 index 0000000..62f1e55 --- /dev/null +++ b/.zprezto/_.git/packed-refs @@ -0,0 +1,33 @@ +# pack-refs with: peeled fully-peeled +d541eef923c24bf0983465c57c93504db3476985 refs/remotes/origin/issue/231-installer +5be4a78b55acba1fbfcb6a7767d7d0743623660d refs/remotes/origin/issue/276-readme-to-man-page +113f6763c22c31dff15a7f776c991596e150e4a1 refs/remotes/origin/issue/306-default-zstyle-function +2d1881c4660d012a0cb0c2c98a4a4cdf07f5ba5c refs/remotes/origin/issue/656-readd-z +f2a826e963f06a204dc0e09c05fc3e5419799f52 refs/remotes/origin/master +98f194595ffad322a6095f68034254e8f8801102 refs/remotes/origin/module/autosuggestions +5f675b0c670b5d2c24c79378962b78c391ec10a9 refs/remotes/origin/module/completion +729fd07ab03b0b9d070c63d6f4972960103294ba refs/remotes/origin/module/git/hub +5ecbb49630d8a9b74a66aa31d9f79d69bd355ec0 refs/remotes/origin/module/update +8e95c547d6b8d3207ba7d20065c69a3aa7f78257 refs/remotes/origin/module/zaw +e3696d2c2862a9c5cb57723dba2133b97cb7ab87 refs/remotes/origin/pull/517-auto-virtualenv +d196c6a15a2b7226a7b950996a707b6ee0c040d0 refs/remotes/origin/pull/533-git-branch-verbose +a97e8de21b162335fc33c119e2cbd903fee429b7 refs/remotes/origin/pull/539-pacman-list-explicit +36e24eeb08579316bb19cd6dd42c9c15d450e71b refs/remotes/origin/pull/552-git-hub-shorten-url +72f8d15b21dd82603d548531d62ae30ded5d24e7 refs/remotes/origin/pull/556-perlbrew-path-zstyle +9852150123d0bf24dc7b496873b1b8af0f41a299 refs/remotes/origin/pull/562-ignored-user-completion +c2d6b378a6b8fb5ad914b88134a05d121af4250a refs/remotes/origin/pull/563-control-arrow-key-bindings +5e6adf89b99c407d5961a7e30a201dcdd8aa9391 refs/remotes/origin/pull/582-tmux-attach-behaviour +b2d84afacf4e3477120e7397354457e58b3e3d4b refs/remotes/origin/pull/598-skip-virtualenv-init +5590b56a877e29bb49832f1bb00a89d7f034af40 refs/remotes/origin/pull/599-terminal-title +9dd65d3982c1265d5cca67edecf8a2a8067dd7a5 refs/remotes/origin/pull/607-tmux-session-name +9ab6ab0d6645b74ee81f5ab6610d093615beb6f5 refs/remotes/origin/pull/628-explainshell +55190ffb428aaf24eb43a960368aa152faf944e8 refs/remotes/origin/pull/636-vim-text-objects +729fd07ab03b0b9d070c63d6f4972960103294ba refs/remotes/origin/pull/638-execute-command-git +c3bd8a47088a1d9f1c1fe2bda023462d656dce80 refs/remotes/origin/pull/651-git-gpg-aliases +72328d0eedac99e1fe342ec31b0e1f4e85a0dc7b refs/remotes/origin/pull/715-git-ignore-template +fb13aa332738c8c414bc4cb602a9bc2378da2a27 refs/remotes/origin/revision/do-not-use +5c7bd2009cc3598e25b8cc607c199b75040e0f34 refs/remotes/origin/revision/prezto +8d9ec24335400a1796937bc8e9caa9830767a762 refs/remotes/origin/revision/use-command_not_found_handler +f5f295cc99d65edbcfeba24d992286bf7e76000f refs/remotes/origin/revision/zdotdir-prezto +b948e3630bb293993e314bcf2691a3ab5a9b23bc refs/remotes/origin/stashes +f2a826e963f06a204dc0e09c05fc3e5419799f52 refs/remotes/origin/theme/sorin diff --git a/.zprezto/_.git/refs/heads/master b/.zprezto/_.git/refs/heads/master new file mode 100644 index 0000000..7e228e7 --- /dev/null +++ b/.zprezto/_.git/refs/heads/master @@ -0,0 +1 @@ +ef60ce5dd6f18fca3bb49a897250e075ded71180 diff --git a/.zprezto/_.git/refs/remotes/origin/HEAD b/.zprezto/_.git/refs/remotes/origin/HEAD new file mode 100644 index 0000000..6efe28f --- /dev/null +++ b/.zprezto/_.git/refs/remotes/origin/HEAD @@ -0,0 +1 @@ +ref: refs/remotes/origin/master diff --git a/.zprezto/_.git/refs/remotes/origin/master b/.zprezto/_.git/refs/remotes/origin/master new file mode 100644 index 0000000..0b80ea2 --- /dev/null +++ b/.zprezto/_.git/refs/remotes/origin/master @@ -0,0 +1 @@ +4f19700919c8ebbaf75755fc0d03716d13183f49 diff --git a/.zprezto/modules/completion/external/_.git b/.zprezto/modules/completion/external/_.git new file mode 100644 index 0000000..da60063 --- /dev/null +++ b/.zprezto/modules/completion/external/_.git @@ -0,0 +1 @@ +gitdir: ../../../.git/modules/modules/completion/external diff --git a/.zprezto/modules/history-substring-search/external/_.git b/.zprezto/modules/history-substring-search/external/_.git new file mode 100644 index 0000000..453d98d --- /dev/null +++ b/.zprezto/modules/history-substring-search/external/_.git @@ -0,0 +1 @@ +gitdir: ../../../.git/modules/modules/history-substring-search/external diff --git a/.zprezto/modules/prompt/external/agnoster/_.git b/.zprezto/modules/prompt/external/agnoster/_.git new file mode 100644 index 0000000..ce70968 --- /dev/null +++ b/.zprezto/modules/prompt/external/agnoster/_.git @@ -0,0 +1 @@ +gitdir: ../../../../.git/modules/modules/prompt/external/agnoster diff --git a/.zprezto/modules/prompt/external/powerline/_.git b/.zprezto/modules/prompt/external/powerline/_.git new file mode 100644 index 0000000..c70a88e --- /dev/null +++ b/.zprezto/modules/prompt/external/powerline/_.git @@ -0,0 +1 @@ +gitdir: ../../../../.git/modules/modules/prompt/external/powerline diff --git a/.zprezto/modules/prompt/external/pure/_.git b/.zprezto/modules/prompt/external/pure/_.git new file mode 100644 index 0000000..e1ddc81 --- /dev/null +++ b/.zprezto/modules/prompt/external/pure/_.git @@ -0,0 +1 @@ +gitdir: ../../../../.git/modules/modules/prompt/functions/pure diff --git a/.zprezto/modules/syntax-highlighting/external/_.git b/.zprezto/modules/syntax-highlighting/external/_.git new file mode 100644 index 0000000..cd073e7 --- /dev/null +++ b/.zprezto/modules/syntax-highlighting/external/_.git @@ -0,0 +1 @@ +gitdir: ../../../.git/modules/modules/syntax-highlighting/external diff --git a/.zprezto/runcoms/zshrc b/.zprezto/runcoms/zshrc index 8281433..80a1370 100644 --- a/.zprezto/runcoms/zshrc +++ b/.zprezto/runcoms/zshrc @@ -87,8 +87,6 @@ function .g-init() { git init --bare $HOME/.dotgit .g config --local status.showUntrackedFiles no .g remote add origin ssh://dedi/root/.dotgit - git config --global user.name "Your Name" - git config --global user.email you@example.com } function twitch() {