background preloader

Git Reference

Git Reference
git reset is probably the most confusing command written by humans, but it can be very useful once you get the hang of it. There are three specific invocations of it that are generally helpful. git reset HEAD unstage files from index and reset pointer to HEAD First, you can use it to unstage something that has been accidentally staged. Let's see what it looks like to unstage something. $ git status -s M README M hello.rb $ git add .$ git status -sM README M hello.rb $ git reset HEAD -- hello.rb Unstaged changes after reset: M hello.rb $ git status -sM README M hello.rb Now you can run a git commit which will just record the changes to the README file, not the now unstaged hello.rb. In case you're curious, what it's actually doing here is it is resetting the checksum of the entry for that file in the "index" to be what it was in the last commit. If you want to be able to just run git unstage, you can easily setup an alias in Git. The third option is to go --hard. Related:  Web Dev Tools

SourceTree | Mercurial and Git GUI for Mac OS X Spacebars Secrets: Exploring Meteor Templates The recent Meteor 0.8 update featured Blaze, a complete rewrite of Meteor’s UI system. And with Blaze came along Spacebars, a replacement for Handlebars, the templating language Meteor was previously using. Spacebars and Handlebars share the same syntax, but Spacebars brings quite a few Meteor-specific innovations. In this article, we’ll take a look at a few of these time-saving techniques, including: Creating custom helpers. Using JavaScript objects as arguments. Let’s get started! Custom Helpers This isn’t new to Spacebars, but it’s worth pointing out because it can make your code much more concise. You could write a simple helper: And then use it inside your template: <template name="profile"><h3>{{name}}</h3><h4>{{createdAtFormatted}}</h4><p>{{bio}}</p></template> This works great, but you might need to format multiple timestamps across your app, thus leading to duplicated template helpers. And invoke it right from your template: Objects as Arguments Smarter Attributes Content Blocks

Git Reference So far we have been committing snapshots of your project and switching between different isolated contexts, but what if we've forgotten how we've got to where we are? Or what if we want to know how one branch differs from another? Git provides a tool that shows you all the commit messages that have lead up to the snapshot you are currently on, which is called git log. To understand the log command, you have to understand what information is stored when you run the git commit command to store a snapshot. In addition to the manifest of files and commit message and information about the person who committed it, Git also stores the commit that you based this snapshot on. To see a chronological list of the parents of any branch, you can run git log when you are in that branch. To see a more compact version of the same history, we can use the --oneline option. What this is telling us is that this is the history of the development of this project.

Google Apps SMTP settings to send mail from a printer, scanner, or app - Google Apps Administrator Help You can set up your on-premises multifunction printer, scanner, fax, or application to send email through Google Apps. The three available options are: SMTP relay service, Gmail SMTP server and Restricted Gmail SMTP server. For details about configuring your device or application to send SMTP messages, refer to its documentation. Google Support cannot assist with the configuration settings. SMTP relay service - used to send mail from your organization by authenticating with the IP address(s). The table below will help you decide which one of these options will best meet your needs: You can use the SMTP relay service in the Google Admin console to relay mail from your device or application. Gmail SMTP Server could also be used to relay messages from your device or application. If your device or application supports SSL - connect to smtp.gmail.com on port 465. To connect with SSL, you need to provide a Google username and password for authentication.

Community Mailing List Questions or comments for the Git community can be sent to the mailing list by using the email address git@vger.kernel.org. Bug reports for git should be sent to this mailing list. You do not need to subscribe: you will be Cc'd in replies. Please keep the Cc list intact when replying (use "Reply to all"). Greylisting may delay your first post for a few hours. By subscribing (click here), you can make sure you're not missing follow-up discussions and you can also learn about other development in the community. Windows-specific questions can also be sent to the Git for Windows mailing list (if in doubt whether your question is Windows-specific, just use the general Git mailing list). There is also Git user mailing list on Google Groups which is a nice place for beginners to ask about anything. Bug Reporting Bugs in git can be reported directly to the mailing list (see above for details). Bugs related to this website can be reported at its issue tracker. IRC Channel

“Password incorrect” error - Accounts Help Some examples of apps that do not support the latest security standards include: The Mail app on your iPhone or iPad with iOS 6 or below The Mail app on your Windows phone preceding the 8.1 release Some Mail apps (not built by Google) that come with your Android Phone Some Desktop mail clients like Microsoft Outlook and Mozilla Thunderbird To help keep your account secure, we may block these less secure apps from accessing your account. If this is the case, you have two choices: Upgrade to a more secure app that uses most up to date security measures.

Git Google Spreadsheet as JSON API - Blog Rudy Lee Data store is an important piece in most of the modern applications. The implementation can range from a simple text file to a complicated database systems. In this blog post, I will show you how to use Google Spreadsheet as a data store for your application. Google Spreadsheet provides a convenient way to store, edit, share and retrieve data. This makes Google Spreadsheet appealing if you want to quickly prototype an app and don’t want to spend time building a CRUD interface to manage your data. It is also allow you to output the spreadsheet data in JSON format. In order to enable this feature, first you need to publish the spreadsheet to the web. The next thing that you have to do is getting the spreadsheet ID from the URL. The URL of your spreadsheet should be something like this After retrieving the ID, you can start constructing the JSON API endpoint. It should look something like this:

About - Git Branching and Merging The Git feature that really makes it stand apart from nearly every other SCM out there is its branching model. Git allows and encourages you to have multiple local branches that can be entirely independent of each other. The creation, merging, and deletion of those lines of development takes seconds. This means that you can do things like: Frictionless Context Switching. Notably, when you push to a remote repository, you do not have to push all of your branches. There are ways to accomplish some of this with other systems, but the work involved is much more difficult and error-prone. Small and Fast Git is fast. Git was built to work on the Linux kernel, meaning that it has had to effectively handle large repositories from day one. Benchmarks Let's see how common operations stack up against Subversion, a common centralized version control system that is similar to CVS or Perforce. For testing, large AWS instances were set up in the same availability zone. Distributed

Meteor, Cordova, and Famo.us: The Chill Way to Build Apps This is a guest post from Adam Elkassas, one of the co-founders of social mobile app Down to Chill. I’m a twenty-year old programmer and entrepreneur and here’s the story of how I started the social networking company Down to Chill. The Beginning of our Meteor Journey I attended University of Pennsylvania’s Jerome Fisher Program, where I studied Computer Engineering, Finance, and Statistics before taking a leave of absence after my sophomore year. A year and half ago, I started learning Meteor after trying to find a way to make my college note sharing website Noteriety able to process real time transactions. We built Noteriety completely in Meteor, […] acquiring over 5000 users After frustration with the Ruby on Rails framework in the summer of 2013, my good friend Arjun Jain and I decided to learn Meteor and stumbled upon Discover Meteor. In fact, we ended up taking a Friday night reading the whole book instead of being social 19-year-olds. The Idea The Tech Stack Performance Analysis

Git de l'intérieur Notes de lecture : Pour simplifier la lecture, l'auteur a pris des libertés avec les formats des fichiers internes de git. Elle présente ces fichiers comme s'ils étaient stockés en clair sur le disque (lisibles avec un éditeur de texte), mais ce n'est pas le cas. Après l'exécution de la première commande git add data/lettre.txt, le blob obtenu ne sera pas lisible depuis un éditeur. En effet, le format de fichier réel contient des caractères non imprimables dans son entête, il est de plus compressé avec zlib après la génération de l'empreinte SHA1. Si vous souhaitez vérifier vous-même le contenu des fichiers au fil de la lecture, les commandes suivantes (internes à git) vous aideront grandement. Depuis la racine du dépôt : Dernier point, l'auteur de l'article part du principe que vous êtes sur une machine de type Unix avec un bash standard. L'équipe de traduction. Ce tutoriel va vous expliquer le fonctionnement de git. ~ $ mkdir alpha ~ $ cd alpha alpha └── data └── lettre.txt ~/alpha $ cd ..

Axure and Font Awesome Library Widgets | ButterUI You can get this By following these directions 1) Download the latest Font-Awesome list. 2) Install the Font-Awesome list to your machine fonts dir. 3) Open up Axure 7. That is what I am using same procedure in 6. 4) Create a new document then go to Publish > Generate HTML File 5) In the popup box add to the Web Fonts box 6) Install my FontAwesomeV4.0.3.rplib which you can download free. * I will continue to add to this as they mature the Font-Awesome icon base. ** Now supporting 1 New Icon Types in 4.0 ** Added Form Control Icons

Rebaser Dans Git, il y a deux façons d'intégrer les modifications d'une branche dans une autre : en fusionnant (merge) et en rebasant (rebase). Dans ce chapitre, vous apprendrez la signification de rebaser, comment le faire, pourquoi c'est un outil plutôt ébouriffant et dans quels cas il est déconseillé de l'utiliser. Les bases Si vous revenez à un exemple précédent du chapitre sur la fusion (voir la figure 3-27), vous remarquerez que votre travail a divergé et que vous avez ajouté des commits sur deux branches différentes. Figure 3-27. Votre historique divergent initial. Comme nous l'avons déjà expliqué, le moyen le plus simple pour intégrer ensemble ces branches est la fusion via la commande merge. Figure 3-28. Cependant, il existe un autre moyen : vous pouvez prendre le patch de la modification introduite en C3 et le réappliquer sur C4. Dans cet exemple, vous lanceriez les commandes suivantes : Figure 3-29. Figure 3-30. Rebasages plus intéressants Figure 3-31. Figure 3-32. Figure 3-33.

Related: