Differences

This shows you the differences between two versions of the page.

--- scratch [2017/04/27 23:11] – admin
+++ scratch [2019/01/31 14:31] – [Git] admin
@@ Line 1: / Line 1: @@
-====== Maustasten belegen in Linux Mint (bzw. Ubuntu) ======
+====== Maustasten belegen ======
+===== Linux Mint (bzw. Ubuntu) =====
 https://help.ubuntu.com/community/ManyButtonsMouseHowto
@@ Line 14: / Line 16: @@
-~./imwheelrc:
+~/.imwheelrc:
   ".*"
-  None,		ExtBt7,   Control_L|Alt_L|Shift_L|M
+  None,		ExtBt7,   Alt_L|F9
 Und schließlich unter //Einstellungen / Tastatur / Tastenkombinationen / Fenster / Fenster verkleinern// \\
-//Ctrl + Alt + Shift + M// einstellen.
+//Alt + F9// einstellen (sollte aber auch Default sein).
+===== Arch Linux =====
+xorg-xev, xbindkeys und xdotool installieren:
+  pacman -S xbindkeys xdotool xorg-xev
+mit //xev// Button Nummer herausfinden.
+Maustasten mit xbindkeys auf Tastendrücke legen:
+~./xbindkeysrc:
+  # Button 10 sends ALT+F9
+  "xdotool key alt+F9"
+  b:10
+xbindkeys automatisch beim Einloggen starten:
+~/.xprofile:
+  xbindkeys &
+In Desktop-Einstellungen ALT-F9 auf gewünschte Funktion, z.B. //Fenster minimieren// setzen.
+====== Mausgeschwindigkeit einstellen ======
+Per 'xset'.
+Z.B.:
+''xset m 5/4 0''
+Das ganze dann als Startup definieren,
+#cat ~/.config/autostart/mouse.desktop
+  [Desktop Entry]
+  Name=Set mouse sensitivity
+  Exec=xset m 5/4 0
+  Type=Application
+  Comment=Use xset to set mouse params
+  Comment[en_US]=Use xset to set mouse params
+  Comment[de_DE]=Benutzt xset um die Maus-Geschwindigkeit einzustellen
+Siehe auch: http://www.pontikis.net/blog/fix-mouse-sensitivity-ubuntu
@@ Line 60: / Line 103: @@
 ''
+  #                                                                   #
+  # Command line                                                      # Bitbucket (prefered)
+  #                                                                   #
+  ====================================== Create a new branch =====================================================
+  # Create and checkout branch                                        Bitbucket: Create the branch in Bitbucket
+  git checkout -b <branch>
+                                                                      # Fetch the new branch and check it out
+  # Push (empty) branch to the remote repository                      git fetch
+  git push -u origin <branch>                                         git checkout LSAS-0815_CoolFeature
+  # Do the work: edit, add, ...
+  # Commit the branch
+  git commit -m "Insert commit message here"
+  # Push branch to the remote repository
+  # ***********************************************************
+  # Note: From Pro Git book: "In general the way to get the best of both worlds is to rebase local changes
+  # you’ve made but haven’t shared yet before you push them in order to clean up your story, but never rebase
+  # anything you’ve pushed somewhere.
+  #
+  # => so better first commit locally until finished, then rebase and then push to origin.
+  # ***********************************************************
+  git push    # Specify upstream if not already done above: git push -u origin <branch>
+  ====================================== 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 <branch>
+  git pull    # only if branch is already pushed to origin
+  # 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
+  ====================================== Merge the branch with master ============================================
+  git checkout master                                                 Bitbucket: Create pull request
+  git merge <branch>                                                  Bitbucket: Merge
+  git push                                                            Bitbucket: Delete <branch>