Ci-dessous, les différences entre deux révisions de la page.
Les deux révisions précédentesRévision précédenteProchaine révision | Révision précédente | ||
robots:rasmobot:linux_cfg [05/2019] – [installation] fred | robots:rasmobot:linux_cfg [07/2020] (Version actuelle) – [branch] fred | ||
---|---|---|---|
Ligne 6: | Ligne 6: | ||
</ | </ | ||
^ desc ^ | ^ desc ^ | ||
+ | | Rpi Zero W sur poteau | 43. | -67. | -256 | | ||
+ | | Rpi Zero W ds haie | 42. | -68. | -256 | | ||
| Rpi Zero W bureau | | Rpi Zero W bureau | ||
| Rpi Zero W sous télé | | Rpi Zero W sous télé | ||
Ligne 72: | Ligne 74: | ||
git fetch | git fetch | ||
git pull | git pull | ||
+ | git status | ||
git commit toto.c -m "bla bla" | git commit toto.c -m "bla bla" | ||
- | ou git add -A && git commit | + | ou git add -A && git commit |
+ | ou git commit -a -m"bla bla" | ||
git push | git push | ||
- | tree view : git log --graph --pretty=oneline --abbrev-commit | tig | + | tree view : |
+ | * git log --graph --pretty=oneline --abbrev-commit | ||
+ | * glt = !git --no-pager log --oneline --all --graph --decorate -n 20 | ||
resumé de diff : git diff --stat | resumé de diff : git diff --stat | ||
</ | </ | ||
Ligne 96: | Ligne 103: | ||
git init --bare myrepo | git init --bare myrepo | ||
</ | </ | ||
+ | |||
+ | ou git init pour créer un dépôt git dans un répertoire de travail , puis git remote add origin https:// | ||
+ | ===== branch ===== | ||
+ | <code C> | ||
+ | git remote | ||
+ | git branch une_branche | ||
+ | git checkout une_branche | ||
+ | git branch | ||
+ | git mergetool main.c | ||
+ | git rebase --continue (surtout ne pas faire git commit , c est le rebase que le " | ||
+ | git push origin feature_branch_name | ||
+ | //-u option to set up a tracking branch? | ||
+ | </ | ||
+ | |||
+ | Mettre de coté une modif | ||
+ | <code bash> | ||
+ | git --no-pager log --oneline --graph --decorate -n 15 | ||
+ | git branch modif_a_mettre_de_cote | ||
+ | git checkout branche_principale | ||
+ | git reset --hard 73b599328 | ||
+ | git push origin branche_principale -f | ||
+ | ou git push origin HEAD: | ||
+ | </ | ||
+ | |||
+ | <code bash> | ||
+ | ~/ | ||
+ | * 9eea3bb (master) modif master F2 2eme | ||
+ | * 3a87e6c modif master F2 | ||
+ | | * 0ce25ca (HEAD -> modifSKR) modif ds branche | ||
+ | |/ | ||
+ | * 98df5cf 1er modif du master | ||
+ | * 2920836 init du depo | ||
+ | 0 | ||
+ | ~/ | ||
+ | fatal: Needed a single revision | ||
+ | invalid upstream ' | ||
+ | 1 | ||
+ | ~/ | ||
+ | First, rewinding head to replay your work on top of it... | ||
+ | Applying: modif ds branche | ||
+ | 0 | ||
+ | ~/ | ||
+ | * 4d20e35 (HEAD -> modifSKR) modif ds branche | ||
+ | * 9eea3bb (master) modif master F2 2eme | ||
+ | * 3a87e6c modif master F2 | ||
+ | * 98df5cf 1er modif du master | ||
+ | * 2920836 init du depo | ||
+ | |||
+ | |||
+ | </ | ||
+ | |||
+ | | ||
+ | <code bash> | ||
+ | glt = !git --no-pager log --oneline --all --graph --decorate -n 20 | ||
+ | |||
+ | |||
+ | [diff] | ||
+ | tool = mybc4 | ||
+ | #Show commit details of the changed submodules when running "git diff" from the parent repository | ||
+ | submodule = log | ||
+ | [difftool] | ||
+ | prompt = false | ||
+ | [difftool " | ||
+ | #use cygpath to transform cygwin path $LOCAL (something like / | ||
+ | cmd = '/ | ||
+ | [merge] | ||
+ | tool = mybc4 | ||
+ | [mergetool] | ||
+ | prompt = false | ||
+ | [mergetool " | ||
+ | # | ||
+ | cmd = '/ | ||
+ | [color] | ||
+ | ui = auto | ||
+ | |||
+ | [color " | ||
+ | added = green bold | ||
+ | changed = yellow bold | ||
+ | untracked = red | ||
+ | </ | ||
+ | |||
+ | ===== github ===== | ||
+ | * https:// | ||
+ | * http:// | ||
+ | |||
====== installation ====== | ====== installation ====== | ||
* télécharger la dernière version de [[http:// | * télécharger la dernière version de [[http:// | ||
Ligne 134: | Ligne 226: | ||
<code C> | <code C> | ||
sudo apt-get upgrade | sudo apt-get upgrade | ||
+ | sudo apt-get clean | ||
sudo raspi-config | sudo raspi-config | ||
sudo reboot | sudo reboot | ||
+ | sudo apt-get install wiringpi | ||
+ | $ gpio -v | ||
+ | $ gpio readall | ||
+ | sudo apt-get install git | ||
+ | |||
+ | |||
+ | |||
+ | // si interface graphique | ||
+ | |||
sudo apt-get install tightvncserver | sudo apt-get install tightvncserver | ||
tightvncserver | tightvncserver |