Compare commits

...

No commits in common. "master" and "gh-pages" have entirely different histories.

16 changed files with 424 additions and 3127 deletions

View File

@ -1,37 +0,0 @@
# Базовая конфигурация git
## Возможности
* Автозавершение команд и названий веток по табу
* Отображение названия текущей ветки в консоли.
gaech@mac:~/Projects/My/git-config[master]
* Сокращения для основных команд
* pull → pl
* ph → ph
* checkout → co
* commit → ci
* status → st
* branch → br
* красивый log → hist
* SublimeText - текстовый редактор
* OpenDiff - для сравнения версий файлов
## Перед запуском
Создаем симлинк для SublimeText 2
sudo ln -s "/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl" /usr/local/bin/subl
Задаем имя и адрес почты в настройках git
git config --global user.name "Andrej Gaevskij"
git config --global user.email "andrej.gaevskij@gmail.com"
## Установка
git clone https://github.com/TouchInstinct/git-config.git
cd git-config/
sh install.sh

View File

@ -1,25 +0,0 @@
source ~/.git_completion
function parse_git_branch {
git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/[\1]/'
}
function proml {
case $TERM in
xterm*)
TITLEBAR='\[\033]0;\u@\h:\w\007\]'
;;
*)
TITLEBAR=""
;;
esac
PS1="${TITLEBAR}\
\u@\h:\w\$(parse_git_branch)\
\$ "
PS2='> '
PS4='+ '
}
proml

File diff suppressed because it is too large Load Diff

View File

@ -1,18 +0,0 @@
[alias]
pl = pull
ph = push
co = checkout
ci = commit
st = status
br = branch
hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
[color]
ui = auto
[merge]
tool = opendiff
[core]
editor = subl -w
ignorecase = false

View File

@ -1,9 +0,0 @@
В этой папке находятся хуки к репозиторию которые делают:
1. Добавляют в сообщение коммита имя ветки в которой этот коммит был сделан. Нарпимер так: "<CoolFeatureBranch> bla bla bla"
2. Пресекают коммиты "в будущее". Т.е. если локальное время сильно отличается от серверного то коммит сделать не получится
###### Инструкции по установке хуков
1. Поскольку хуки это то, что относится к репозиторию, то сначала папку **githooks** нужно скопировать в корень репозитория в котором они должны применяться
2. Перейдите в папку githooks `$ cd githooks`
3. Запустите инсталяционный скрипт `$ sh ./install_hooks.sh`

View File

@ -1,43 +0,0 @@
#!/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
#}
echo "commit-msg hook"
COMMENT=`cat "$1"`
#BRANCH=`git symbolic-ref --short HEAD`
BRANCH=`git rev-parse --abbrev-ref HEAD`
FIRST_COMMENT_CHAR=${COMMENT:0:1}
if [ "$FIRST_COMMENT_CHAR" = "<" ]; then
exit
fi
COMMENT="<$BRANCH> $COMMENT"
echo "$COMMENT" > "$1"
echo "commit-msg hook completed"

View File

@ -1,7 +0,0 @@
TARGET=../.git/hooks
cp commit-msg ${TARGET}
cp pre-commit ${TARGET}
cp prepare-commit-msg ${TARGET}
chmod a+x ${TARGET}/commit-msg ${TARGET}/pre-commit ${TARGET}/prepare-commit-msg

View File

@ -1,8 +0,0 @@
#!/bin/sh
offlineDate="$(date +"%j")"
onlineDate=$(echo cat $(echo cat $(curl -L 'timeanddate.com/calendar/custom.html?country=20&cols=6&hol=0&pbr=1&ctf=5&ctc=2&cci=6&ccu=5&holm=1&doy=1&display=2&df=1' 2> /dev/null) | grep -o -E "chi\"> <span class=cyd>\([0-9]{1,3}\)</") | grep -o -E "[0-9]{1,3}")
if [ $onlineDate -ne $offlineDate ]; then
echo "Date is incorrect! Check your local date!"
exit 1
fi

View File

@ -1,43 +0,0 @@
#!/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
#}
echo "prepare-commit-msg hook"
COMMENT=`cat "$1"`
#BRANCH=`git symbolic-ref --short HEAD`
BRANCH=`git rev-parse --abbrev-ref HEAD`
FIRST_COMMENT_CHAR=${COMMENT:0:1}
if [ "$FIRST_COMMENT_CHAR" = "<" ]; then
exit
fi
COMMENT="<$BRANCH> $COMMENT"
echo "$COMMENT" > "$1"
echo "prepare-commit-msg hook completed"

201
gitignore
View File

@ -1,201 +0,0 @@
################
### WINDOWS
################
Thumbs.db
Desktop.ini
$RECYCLE.BIN/
################
### OSX
################
.DS_Store
._*
.Spotlight-V100
.Trashes
################
### MONODEVELOP
################
*.userprefs
*.usertasks
*.pidb
*.resources
test-results/
################
### SUBLIME
################
/*.sublime-project
*.sublime-workspace
################
### ECLIPSE
################
*.pydevproject
.project
.metadata
bin/**
tmp/**
tmp/**/*
*.tmp
*.bak
*.swp
*~.nib
local.properties
.classpath
.settings/
.loadpath
# External tool builders
.externalToolBuilders/
# Locally stored "Eclipse launch configurations"
*.launch
# CDT-specific
.cproject
# PDT-specific
.buildpath
################
#### CSHARP
################
# Build Folders (you can keep bin if you'd like, to store dlls and pdbs)
[Bb]in/
[Oo]bj/
# mstest test results
TestResults
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.
# User-specific files
*.suo
*.user
*.sln.docstates
# Build results
[Dd]ebug/
[Rr]elease/
x64/
*_i.c
*_p.c
*.ilk
*.meta
*.obj
*.pch
*.pdb
*.pgc
*.pgd
*.rsp
*.sbr
*.tlb
*.tli
*.tlh
*.tmp
*.vspscc
*.vssscc
.builds
# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opensdf
*.sdf
# Visual Studio profiler
*.psess
*.vsp
# Guidance Automation Toolkit
*.gpState
# ReSharper is a .NET coding add-in
_ReSharper*
# NCrunch
*.ncrunch*
.*crunch*.local.xml
# Installshield output folder
[Ee]xpress
# DocProject is a documentation generator add-in
DocProject/buildhelp/
DocProject/Help/*.HxT
DocProject/Help/*.HxC
DocProject/Help/*.hhc
DocProject/Help/*.hhk
DocProject/Help/*.hhp
DocProject/Help/Html2
DocProject/Help/html
# Click-Once directory
publish
# Publish Web Output
*.Publish.xml
# Others
[Bb]in
[Oo]bj
sql
TestResults
[Tt]est[Rr]esult*
*.Cache
ClientBin
[Ss]tyle[Cc]op.*
~$*
*.dbmdl
Generated_Code #added for RIA/Silverlight projects
# Backup & report files from converting an old project file to a newer
# Visual Studio version. Backup files are not needed, because we have git ;-)
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML
# Compiled source #
###################
*.com
*.class
*.exe
*.o
*.so
# Packages #
############
# it's better to unpack these files and commit the raw source
# git has its own built in compression methods
*.7z
*.dmg
*.gz
*.iso
*.jar
*.rar
*.tar
*.zip
# Logs and databases #
######################
*.log
*.sql
*.sqlite

82
index.html Normal file
View File

@ -0,0 +1,82 @@
<!doctype html>
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="chrome=1">
<title>git-config by gaech</title>
<link rel="stylesheet" href="stylesheets/styles.css">
<link rel="stylesheet" href="stylesheets/pygment_trac.css">
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
<!--[if lt IE 9]>
<script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
</head>
<body>
<div class="wrapper">
<header>
<h1>git-config</h1>
<p>Моя базовая конфигурация git</p>
<p class="view"><a href="https://github.com/gaech/git-config">View the Project on GitHub <small>gaech/git-config</small></a></p>
<ul>
<li><a href="https://github.com/gaech/git-config/zipball/master">Download <strong>ZIP File</strong></a></li>
<li><a href="https://github.com/gaech/git-config/tarball/master">Download <strong>TAR Ball</strong></a></li>
<li><a href="https://github.com/gaech/git-config">View On <strong>GitHub</strong></a></li>
</ul>
</header>
<section>
<h1>Базовая конфигурация git</h1>
<h2>Возможности</h2>
<ul>
<li>Автозавершение команд и названий веток по табу<br>
</li>
<li>Отображение названия текущей ветки в консоли.
<code>
gaech@mac:~/Projects/My/git-config[master]
</code> </li>
<li>Глобальный ignore файл</li>
<li>Сокращения для основных команд
<ul>
<li>pull → pl</li>
<li>ph → ph</li>
<li>checkout → co</li>
<li>commit → ci</li>
<li>status → st</li>
<li>branch → br</li>
<li>красивый log → hist</li>
</ul>
</li>
<li>SublimeText - текстовый редактор</li>
<li>OpenDiff - для сравнения версий файлов</li>
</ul><h2>Перед запуском</h2>
<p>Создаем симлинк для SublimeText 2</p>
<pre><code>sudo ln -s "/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl" /bin/subl
</code></pre>
<p>Задаем имя и адрес почты в настройках git</p>
<pre><code>git config --global user.name "Andrej Gaevskij"
git config --global user.email "andrej.gaevskij@gmail.com"
</code></pre>
<h2>Установка</h2>
<pre><code>git clone git://github.com/gaech/git-config.git
cd git-config/
sh install.sh
</code></pre>
</section>
<footer>
<p>This project is maintained by <a href="https://github.com/gaech">gaech</a></p>
<p><small>Hosted on GitHub Pages &mdash; Theme by <a href="https://github.com/orderedlist">orderedlist</a></small></p>
</footer>
</div>
<script src="javascripts/scale.fix.js"></script>
</body>
</html>

View File

@ -1,16 +0,0 @@
#!/bin/bash
email=$(git config --global --get user.email)
name=$(git config --global --get user.name)
cp -f gitconfig ~/.gitconfig
git config --global user.email "$email"
git config --global user.name "$name"
cp -f gitignore ~/.gitignore_global
git config --global core.excludesfile ~/.gitignore_global
cp -f gitcompletion ~/.git_completion
cat bashprofile >> ~/.bash_profile

17
javascripts/scale.fix.js Normal file
View File

@ -0,0 +1,17 @@
var metas = document.getElementsByTagName('meta');
var i;
if (navigator.userAgent.match(/iPhone/i)) {
for (i=0; i<metas.length; i++) {
if (metas[i].name == "viewport") {
metas[i].content = "width=device-width, minimum-scale=1.0, maximum-scale=1.0";
}
}
document.addEventListener("gesturestart", gestureStart, false);
}
function gestureStart() {
for (i=0; i<metas.length; i++) {
if (metas[i].name == "viewport") {
metas[i].content = "width=device-width, minimum-scale=0.25, maximum-scale=1.6";
}
}
}

1
params.json Normal file
View File

@ -0,0 +1 @@
{"name":"git-config","body":"# Базовая конфигурация git\r\n\r\n## Возможности \r\n * Автозавершение команд и названий веток по табу \r\n * Отображение названия текущей ветки в консоли. \r\n```\r\n gaech@mac:~/Projects/My/git-config[master]\r\n``` \r\n * Глобальный ignore файл\r\n * Сокращения для основных команд\r\n * pull → pl\r\n * ph → ph\r\n * checkout → co\r\n * commit → ci\r\n * status → st\r\n * branch → br\r\n * красивый log → hist\r\n * SublimeText - текстовый редактор\r\n * OpenDiff - для сравнения версий файлов\r\n\r\n\r\n\r\n## Перед запуском\r\nСоздаем симлинк для SublimeText 2\r\n\r\n sudo ln -s \"/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl\" /bin/subl\r\n\r\nЗадаем имя и адрес почты в настройках git\r\n\r\n git config --global user.name \"Andrej Gaevskij\"\r\n git config --global user.email \"andrej.gaevskij@gmail.com\"\r\n\r\n## Установка\r\n git clone git://github.com/gaech/git-config.git\r\n cd git-config/\r\n sh install.sh","tagline":"Моя базовая конфигурация git","google":"","note":"Don't delete this file! It's used internally to help with page regeneration."}

View File

@ -0,0 +1,69 @@
.highlight { background: #ffffff; }
.highlight .c { color: #999988; font-style: italic } /* Comment */
.highlight .err { color: #a61717; background-color: #e3d2d2 } /* Error */
.highlight .k { font-weight: bold } /* Keyword */
.highlight .o { font-weight: bold } /* Operator */
.highlight .cm { color: #999988; font-style: italic } /* Comment.Multiline */
.highlight .cp { color: #999999; font-weight: bold } /* Comment.Preproc */
.highlight .c1 { color: #999988; font-style: italic } /* Comment.Single */
.highlight .cs { color: #999999; font-weight: bold; font-style: italic } /* Comment.Special */
.highlight .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
.highlight .gd .x { color: #000000; background-color: #ffaaaa } /* Generic.Deleted.Specific */
.highlight .ge { font-style: italic } /* Generic.Emph */
.highlight .gr { color: #aa0000 } /* Generic.Error */
.highlight .gh { color: #999999 } /* Generic.Heading */
.highlight .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
.highlight .gi .x { color: #000000; background-color: #aaffaa } /* Generic.Inserted.Specific */
.highlight .go { color: #888888 } /* Generic.Output */
.highlight .gp { color: #555555 } /* Generic.Prompt */
.highlight .gs { font-weight: bold } /* Generic.Strong */
.highlight .gu { color: #800080; font-weight: bold; } /* Generic.Subheading */
.highlight .gt { color: #aa0000 } /* Generic.Traceback */
.highlight .kc { font-weight: bold } /* Keyword.Constant */
.highlight .kd { font-weight: bold } /* Keyword.Declaration */
.highlight .kn { font-weight: bold } /* Keyword.Namespace */
.highlight .kp { font-weight: bold } /* Keyword.Pseudo */
.highlight .kr { font-weight: bold } /* Keyword.Reserved */
.highlight .kt { color: #445588; font-weight: bold } /* Keyword.Type */
.highlight .m { color: #009999 } /* Literal.Number */
.highlight .s { color: #d14 } /* Literal.String */
.highlight .na { color: #008080 } /* Name.Attribute */
.highlight .nb { color: #0086B3 } /* Name.Builtin */
.highlight .nc { color: #445588; font-weight: bold } /* Name.Class */
.highlight .no { color: #008080 } /* Name.Constant */
.highlight .ni { color: #800080 } /* Name.Entity */
.highlight .ne { color: #990000; font-weight: bold } /* Name.Exception */
.highlight .nf { color: #990000; font-weight: bold } /* Name.Function */
.highlight .nn { color: #555555 } /* Name.Namespace */
.highlight .nt { color: #000080 } /* Name.Tag */
.highlight .nv { color: #008080 } /* Name.Variable */
.highlight .ow { font-weight: bold } /* Operator.Word */
.highlight .w { color: #bbbbbb } /* Text.Whitespace */
.highlight .mf { color: #009999 } /* Literal.Number.Float */
.highlight .mh { color: #009999 } /* Literal.Number.Hex */
.highlight .mi { color: #009999 } /* Literal.Number.Integer */
.highlight .mo { color: #009999 } /* Literal.Number.Oct */
.highlight .sb { color: #d14 } /* Literal.String.Backtick */
.highlight .sc { color: #d14 } /* Literal.String.Char */
.highlight .sd { color: #d14 } /* Literal.String.Doc */
.highlight .s2 { color: #d14 } /* Literal.String.Double */
.highlight .se { color: #d14 } /* Literal.String.Escape */
.highlight .sh { color: #d14 } /* Literal.String.Heredoc */
.highlight .si { color: #d14 } /* Literal.String.Interpol */
.highlight .sx { color: #d14 } /* Literal.String.Other */
.highlight .sr { color: #009926 } /* Literal.String.Regex */
.highlight .s1 { color: #d14 } /* Literal.String.Single */
.highlight .ss { color: #990073 } /* Literal.String.Symbol */
.highlight .bp { color: #999999 } /* Name.Builtin.Pseudo */
.highlight .vc { color: #008080 } /* Name.Variable.Class */
.highlight .vg { color: #008080 } /* Name.Variable.Global */
.highlight .vi { color: #008080 } /* Name.Variable.Instance */
.highlight .il { color: #009999 } /* Literal.Number.Integer.Long */
.type-csharp .highlight .k { color: #0000FF }
.type-csharp .highlight .kt { color: #0000FF }
.type-csharp .highlight .nf { color: #000000; font-weight: normal }
.type-csharp .highlight .nc { color: #2B91AF }
.type-csharp .highlight .nn { color: #000000 }
.type-csharp .highlight .s { color: #A31515 }
.type-csharp .highlight .sc { color: #A31515 }

255
stylesheets/styles.css Normal file
View File

@ -0,0 +1,255 @@
@import url(https://fonts.googleapis.com/css?family=Lato:300italic,700italic,300,700);
body {
padding:50px;
font:14px/1.5 Lato, "Helvetica Neue", Helvetica, Arial, sans-serif;
color:#777;
font-weight:300;
}
h1, h2, h3, h4, h5, h6 {
color:#222;
margin:0 0 20px;
}
p, ul, ol, table, pre, dl {
margin:0 0 20px;
}
h1, h2, h3 {
line-height:1.1;
}
h1 {
font-size:28px;
}
h2 {
color:#393939;
}
h3, h4, h5, h6 {
color:#494949;
}
a {
color:#39c;
font-weight:400;
text-decoration:none;
}
a small {
font-size:11px;
color:#777;
margin-top:-0.6em;
display:block;
}
.wrapper {
width:860px;
margin:0 auto;
}
blockquote {
border-left:1px solid #e5e5e5;
margin:0;
padding:0 0 0 20px;
font-style:italic;
}
code, pre {
font-family:Monaco, Bitstream Vera Sans Mono, Lucida Console, Terminal;
color:#333;
font-size:12px;
}
pre {
padding:8px 15px;
background: #f8f8f8;
border-radius:5px;
border:1px solid #e5e5e5;
overflow-x: auto;
}
table {
width:100%;
border-collapse:collapse;
}
th, td {
text-align:left;
padding:5px 10px;
border-bottom:1px solid #e5e5e5;
}
dt {
color:#444;
font-weight:700;
}
th {
color:#444;
}
img {
max-width:100%;
}
header {
width:270px;
float:left;
position:fixed;
}
header ul {
list-style:none;
height:40px;
padding:0;
background: #eee;
background: -moz-linear-gradient(top, #f8f8f8 0%, #dddddd 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f8f8f8), color-stop(100%,#dddddd));
background: -webkit-linear-gradient(top, #f8f8f8 0%,#dddddd 100%);
background: -o-linear-gradient(top, #f8f8f8 0%,#dddddd 100%);
background: -ms-linear-gradient(top, #f8f8f8 0%,#dddddd 100%);
background: linear-gradient(top, #f8f8f8 0%,#dddddd 100%);
border-radius:5px;
border:1px solid #d2d2d2;
box-shadow:inset #fff 0 1px 0, inset rgba(0,0,0,0.03) 0 -1px 0;
width:270px;
}
header li {
width:89px;
float:left;
border-right:1px solid #d2d2d2;
height:40px;
}
header ul a {
line-height:1;
font-size:11px;
color:#999;
display:block;
text-align:center;
padding-top:6px;
height:40px;
}
strong {
color:#222;
font-weight:700;
}
header ul li + li {
width:88px;
border-left:1px solid #fff;
}
header ul li + li + li {
border-right:none;
width:89px;
}
header ul a strong {
font-size:14px;
display:block;
color:#222;
}
section {
width:500px;
float:right;
padding-bottom:50px;
}
small {
font-size:11px;
}
hr {
border:0;
background:#e5e5e5;
height:1px;
margin:0 0 20px;
}
footer {
width:270px;
float:left;
position:fixed;
bottom:50px;
}
@media print, screen and (max-width: 960px) {
div.wrapper {
width:auto;
margin:0;
}
header, section, footer {
float:none;
position:static;
width:auto;
}
header {
padding-right:320px;
}
section {
border:1px solid #e5e5e5;
border-width:1px 0;
padding:20px 0;
margin:0 0 20px;
}
header a small {
display:inline;
}
header ul {
position:absolute;
right:50px;
top:52px;
}
}
@media print, screen and (max-width: 720px) {
body {
word-wrap:break-word;
}
header {
padding:0;
}
header ul, header p.view {
position:static;
}
pre, code {
word-wrap:normal;
}
}
@media print, screen and (max-width: 480px) {
body {
padding:15px;
}
header ul {
display:none;
}
}
@media print {
body {
padding:0.4in;
font-size:12pt;
color:#444;
}
}