This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<code_scheme name="SPIP"> | |
<option name="OTHER_INDENT_OPTIONS"> | |
<value> | |
<option name="INDENT_SIZE" value="2" /> | |
<option name="CONTINUATION_INDENT_SIZE" value="8" /> | |
<option name="TAB_SIZE" value="2" /> | |
<option name="USE_TAB_CHARACTER" value="true" /> | |
<option name="SMART_TABS" value="false" /> | |
<option name="LABEL_INDENT_SIZE" value="0" /> | |
<option name="LABEL_INDENT_ABSOLUTE" value="false" /> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/usr/bin/php | |
<?php | |
$activer = $argv; | |
array_shift($activer); | |
if (!is_dir('ecrire/') AND is_dir('../ecrire/')) chdir('../'); | |
chdir('ecrire/'); | |
if (!defined('_DIR_RESTREINT_ABS')) define('_DIR_RESTREINT_ABS', ''); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/usr/bin/php | |
<?php | |
$desactiver = $argv; | |
array_shift($desactiver); | |
if (!is_dir('ecrire/') AND is_dir('../ecrire/')) chdir('../'); | |
chdir('ecrire/'); | |
if (!defined('_DIR_RESTREINT_ABS')) define('_DIR_RESTREINT_ABS', ''); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/usr/bin/php | |
<?php | |
// Report d'un commit d'un repertoire sur un autre | |
// le script fait le merge svn et prepare le log de comit dans log.txt | |
// mais ne fait pas le commit automatiquement car risque de conflits | |
// il faut le faire suivre de la commande comit manuelle si le diff est OK | |
// Syntaxe : | |
// cherry-pick.php -rNNNN source dest | |
// | |
// exemple d'utilisation : |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
##Je me suis trompé | |
git commit --amend | |
permet de reprendre le dernier commit | |
en fait c'est equivalent a : | |
git reset HEAD^ | |
qui revient a l'avant dernier commit et renvoie le diff dans le working tree | |
puis | |
git commit |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
En premier lieu, se faire un prompt git personalisé "qui tue sa mère" : | |
cedric$ ls /usr/local/git/contrib/completion/ | |
cedric$ cp /usr/local/git/contrib/completion/git-completion.bash ~/.git-completion.bash | |
nano ~/.profile | |
et ajouter à la fin les lignes | |
source ~/.git-completion.bash | |
export GIT_PS1_SHOWDIRTYSTATE=1 GIT_PS1_SHOWSTASHSTATE=1 GIT_PS1_SHOWUNTRACKEDFILES=1 | |
export PS1='\[\033[35m\u@\h:\033[36m\W\[\033[0m\033[33m$(__git_ps1 " (%s)")\033[0m\$ ' | |
Du coup dans un repo git le prompt indique la branche, l'etat : |