background preloader

Version control - Git for beginners: The definitive practical guide

Preface Git is a version control Swiss army knife. A reliable versatile multipurpose revision control tool whose extraordinary flexibility makes it tricky to learn, let alone master. As Arthur C. Rather than go into details, we provide rough instructions for particular effects. I’m humbled that so many people have worked on translations of these pages. Dustin Sallings, Alberto Bertogli, James Cameron, Douglas Livingstone, Michael Budde, Richard Albury, Tarmigan, Derek Mahar, Frode Aannevik, Keith Rarick, Andy Somerville, Ralf Recker, Øyvind A. François Marier maintains the Debian package originally created by Daniel Baumann. My gratitude goes to many others for your support and praise. If I’ve left you out by mistake, please tell me or just send me a patch! This guide is released under the GNU General Public License version 3. $ git clone # Creates "gitmagic" directory. or from one of the mirrors:

Creating A Home Media & File Server With Ubuntu For the past two years, I have used FreeNAS 7.x as a file-server. After the development was bought-out, the home-designed service fell by the wayside. The unfortunate consequence is that all of my data was stored on UFS GPT partitions which is does not have native support by either Windows or Linux kernels. The solution I decided upon was to purchase another 2TB hard-drive to use as a storage buffer to copy UFS data and repartition into EXT4 using Ubuntu 11.10’s terminal with a mount command. After that hiccup, I set out to setup the best server option for my needs. This HOWTO will give you the BEST home media and file server out there at a cheap (free) cost. Whilst Ubuntu may be installed on all sorts of hardware specifications, I recommend that you have no less than a 1GHZ dualcore machine (old AMD’s work great!) Assumption: this guide assumes that you have had some minor, newbie experiences with Ubuntu or Linux at the least. Let’s start! Install Ubuntu 11.10. Remote Desktop SAMBA Server

What are the basic clearcase concepts every developer should know A Visual Git Reference If the images do not work, you can try the Non-SVG version of this page. SVG images have been disabled. (Re-enable SVG) This page gives brief, visual reference for the most common commands in git. Once you know a bit about how git works, this site may solidify your understanding. Also recommended: Visualizing Git Concepts with D3 Contents Basic Usage The four commands above copy files between the working directory, the stage (also called the index), and the history (in the form of commits). git add files copies files (at their current state) to the stage. git commit saves a snapshot of the stage as a commit. git reset -- files unstages files; that is, it copies files from the latest commit to the stage. You can use git reset -p, git checkout -p, or git add -p instead of (or in addition to) specifying particular files to interactively choose which hunks copy. It is also possible to jump over the stage and check out files directly from the history or commit files without staging first. Diff Reset

Eclipse Shortcuts Eclipse Shortcuts - Tutorial Copyright © 2009, 2010, 2011, 2012, 2013 Lars Vogel Eclipse Shortcuts This article lists helpful Eclipse shortcuts. 1.1. Using shortcuts make a developer more productive. Eclipse supports of course the typical shortcuts, e.g. This description uses the shortcuts based on Windows and Linux. The Ctrl+3 shortcut allows you to perform all available actions in Eclipse. For example you can open a Preference, a Wizard, a view and a Preference page. You can also use Quick Access to search for an opened editor by typing in the name of the resource which the editor shows. The following screenshot shows how you could use Ctrl+3 to open the Wizard to create a new Java class. 3.1. Eclipse provides shortcuts for opening files or Java artifacts. Table 1. 3.2. If you are working in the Java editor you can also use certain shortcuts for faster navigation. Table 2. Table 3. Table 4. The following lists contains useful keyboard shortcuts if you are inside your Java editor. Table 5.

Mercurial, Subversion, and Wesley Snipes People keep asking me why I don't talk more about Mercurial in this series of blog entries. There's a simple answer to that question: Mercurial isn't very interesting. Wait, that didn't come out quite right. Git is Wesley Snipes. Mercurial is Denzel Washington Hmm, that probably needs further explanation. I am the founder of a version control software company. As part of that effort, I have undertaken an exploration of the DVCS world. The one where I gripe about Git's index The one where I whine about the way Git allows developers to rearrange the DAG The one where it looks like I am against DAG-based version control but I'm really not The one where I fuss about DVCSes that try to act like centralized tools The one where I complain that DVCSes have a lousy story when it comes to bug-tracking The one where I lament that I want to like Darcs but I can't The one where I speculate cluelessly about why Git is so fast Why am I using these tools if I don't like them? I admire Mercurial.

index • Git Cheatsheet • NDP Software stash workspace index local repository upstream repository status Displays paths that have differences between the index file and the current HEAD commit, paths that have differences between the workspace and the index file, and paths in the workspace that are not tracked by git. diff Displays the differences not added to the index. diff commit or branch View the changes you have in your workspace relative to the named <em>commit</em>. add file... or dir... Adds the current content of new or modified files to the index, thus staging that content for inclusion in the next commit. add -u Adds the current content of modified (NOT NEW) files to the index. rm file(s)... Remove a file from the workspace and the index. mv file(s)... Move file in the workspace and the index. commit -a -m 'msg' Commit all files changed since your last commit, except untracked files (ie. all files that are already listed in the index). checkout files(s)... or dir Updates the file or directory in the workspace. reset --soft HEAD^

LED Cube 8x8x8 Another simple effect, effect_planboing(int plane, int speed). This effect draws a plane along the specified axis then moves it from position 0 to 7 on the axis and back again. This is very simple, but it really brings out the depth of the 3d LED cube :) This function doesn't have an iteration loop. Here is what it does: 1) For()-loop i from 0 to 7. 2) Clear the cube with fill(0x00); 3) Call setplane() to draw a plane along the desired axis at position i. 4) Delay for a while. 5) Repeat the same loop with i going from 7 to 0. Very simple, but a very cool effect!

Diff Between Mercurial and Git Learn python in Y Minutes Python was created by Guido van Rossum in the early 90s. It is now one of the most popular languages in existence. I fell in love with Python for its syntactic clarity. It’s basically executable pseudocode. Note: This article applies to Python 3 specifically. Check out here if you want to learn the old Python 2.7 Free Online Got a suggestion? Documentation Documentation Reference Reference Manual The official and comprehensive man pages that are included in the Git package itself. Quick reference guides: GitHub Cheat Sheet | Visual Git Cheat Sheet Book Pro Git The entire Pro Git book written by Scott Chacon and Ben Straub is available to read online for free. Videos See all videos → External Links The External Links section is a curated, ever-evolving collection of tutorials, books, videos, and other Git resources.