Differences
This shows you the differences between two versions of the page.
Both sides previous revision Previous revision Next revision | Previous revision Next revisionBoth sides next revision | ||
scratch [2018/12/13 14:45] – admin | scratch [2019/01/31 07:17] – admin | ||
---|---|---|---|
Line 25: | Line 25: | ||
===== Arch Linux ===== | ===== Arch Linux ===== | ||
- | xbindkeys und xdotool installieren. | + | xorg-xev, |
- | pacman -S xbindkeys xdotool | + | pacman -S xbindkeys xdotool |
- | mit "xev" | + | mit //xev// Button Nummer herausfinden. |
+ | Maustasten mit xbindkeys auf Tastendrücke legen: | ||
~./ | ~./ | ||
# Button 10 sends ALT+F9 | # Button 10 sends ALT+F9 | ||
Line 35: | Line 36: | ||
b:10 | b:10 | ||
- | In Desktop-Einstellungen ALT-F9 auf gewünschte Funktion, z.B. "Fenster minimieren" | + | xbindkeys automatisch beim Einloggen starten: |
+ | ~/ | ||
+ | xbindkeys & | ||
+ | |||
+ | In Desktop-Einstellungen ALT-F9 auf gewünschte Funktion, z.B. //Fenster minimieren// setzen. | ||
Line 98: | Line 103: | ||
'' | '' | ||
+ | ====== Git ====== | ||
+ | # Create branch | ||
+ | git branch < | ||
+ | git checkout < | ||
+ | |||
+ | # Do the work | ||
+ | kate main.cpp | ||
+ | ... | ||
+ | | ||
+ | # Commit the branch | ||
+ | git commit -m " | ||
+ | | ||
+ | ### Rebase ### | ||
+ | | ||
+ | # Update master copy | ||
+ | git checkout master | ||
+ | git pull | ||
+ | # go to branch which should be merged to master and make sure that remote is equal with your copy | ||
+ | git checkout < | ||
+ | git pull | ||
+ | # Start rebase | ||
+ | git rebase master | ||
+ | # solve conflicts with an editor e.g foo.cxx has a conflict | ||
+ | kate foo.cxx # remove conflict | ||
+ | git add foo.cxx | ||
+ | # continue rebasing | ||
+ | git rebase --continue | ||
+ | # if there are no other conflicts to solve, push your branch to remote otherwise solve conflicts | ||
+ | git push --force | ||