scratch

Differences

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

Link to this comparison view

Both sides previous revision Previous revision
Next revision
Previous revision
Next revisionBoth sides next revision
scratch [2018/12/13 14:45] adminscratch [2019/01/31 18:29] – [Floppy auf 720 kB formatieren (USB-Laufwerk)] admin
Line 25: Line 25:
  
 ===== Arch Linux ===== ===== Arch Linux =====
-xbindkeys und xdotool installieren. +xorg-xev, xbindkeys und xdotool installieren: 
-pacman -S xbindkeys xdotool+  pacman -S xbindkeys xdotool xorg-xev
  
-mit "xevButton Nummer herausfinden.+mit //xev// Button Nummer herausfinden.
  
 +Maustasten mit xbindkeys auf Tastendrücke legen:
 ~./xbindkeysrc: ~./xbindkeysrc:
   # 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 minimierensetzen.+xbindkeys automatisch beim Einloggen starten: 
 +~/.xprofile: 
 +  xbindkeys & 
 + 
 +In Desktop-Einstellungen ALT-F9 auf gewünschte Funktion, z.B. //Fenster minimieren// setzen.
  
  
Line 98: Line 103:
 '' ''
  
 +====== Git ======
 +
 +  #                                                                   #
 +  # 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>
  
  • scratch.txt
  • Last modified: 2019/03/10 13:03
  • by admin