background preloader


Facebook Twitter

Sdaschner/asciiblog. Git Large File Storage. Visionmedia/git-extras. Setting Up a GitHub Repository Using NetBeans IDE. Dberkholz: New GitHub repos per year,... Git Internals PDF Open Sourced. Bonita BPM 6.x on GitHub « Bonita open source BPM community blog. Git Koans. Inspired by Vim Koans.

Git Koans

Vim Koans: Silence A Python programmer handed her ~/.gitconfig to Master Git. Among the many lines were the following: [alias] ; Explicit is better than implicit. Master Git nodded. Master Git pulled down the latest changes on master and automatically merged them with the programmer’s changes. Rebasing Merge Commits in Git. I’m one of the devs here at Envato, and this is my first post to the Notes blog.

Rebasing Merge Commits in Git

Learn Git Branching. Formation CoffeeScript. « Mais ?

Formation CoffeeScript

Je croyais que vous formiez sur JavaScript ?! » Mais oui… JavaScript, et son écosystème : les outils de tests, de documentation, les runtimes côté serveur, et d’une façon générale tout ce qui permet de produire un JavaScript de meilleure qualité. CoffeeScript est un outil particulièrement efficace dans cette perspective. Le « petit langage qui compile vers JavaScript » n’est pas là que pour les débutants JavaScript, ou ceux qui ne veulent pas apprendre JavaScript. Au final, CoffeeScript ne produit que du JavaScript, et n’offre donc pas de possibilités que ce dernier n’ait pas, mais les avantages de CoffeeScript sur du JavaScript natif restent nombreux : Ce n’est pas un hasard si même des experts JavaScript reconnus, et même le créateur et mainteneur principal de JavaScript (Brendan Eich, le directeur technique de Mozilla) adorent CoffeeScript, et si ce dernier sert d’inspiration majeure pour, la prochaine version de JavaScript.

Why does git-rebase give me merge conflicts when all I'm doing is squashing commits. How to Read GIT Repository Using Java APIs. GIT is a source code control system created by Linus and others for managing Linux kernel development.

How to Read GIT Repository Using Java APIs

It becomes one of the most popular version control systems especially in the open source community. Most developers use command line or the plugins to IDEs like Eclipse, NetBeans. I think even Microsoft VisualStudio has add-on for connecting to GIT, but I haven’t checked it. If you want more control or integrate GIT with your application, you can use Java APIs (or APIs in other programming languages) connecting to GIT repositories as well. One of the Java implementations is the JGit APIs which is now a project under the Eclipse foundation. As I said many times, APIs are views to the products which are models (think MVC). Once that is clear, let’s move on to a sample which read the content of a file in the HEAD revision. This entry was posted in Software Development and tagged Git, java, vSphere API.

Must Have Git Aliases: Advanced Examples - be present now. Over the course of a few years I piled up a long list of git aliases.

Must Have Git Aliases: Advanced Examples - be present now

This post will assume you know what aliases are and you have defined a few for yourself. I rely on many of them dozens of times a day. And maybe some have slipped your radar. Maybe you've never thought you could do some of these useful things with an alias. Let me show you some of the cool things you can do. You can add all the examples below to the [alias] section of your .gitconfig. To acquire the full list of my aliases you can check out my .gitconfig on Github. Explore your history, the commits and the code Shorten and beautify your log command because you will use it a lot. List commits in short form, with colors and branch/tag annotations. Git Attitude : formations Git qualitatives et sympathiques. Git pull] drm-next. On Sun, 29 Mar 2009, Dave Airlie wrote: > > My plans from now on are just to send you non-linear trees, whenever I > merge a patch into my next tree thats when it stays in there, I'll pull > Eric's tree directly into my tree and then I'll send the results, I > thought we cared about a clean merge history but as I said without some > document in the kernel tree I've up until now had no real idea what you > wanted.

git pull] drm-next

I want clean history, but that really means (a) clean and (b) history. People can (and probably should) rebase their _private_ trees (their own work). That's a _cleanup_. But never other peoples code. That's a "destroy history" So the history part is fairly easy. Git-annex. Subtree merging and you. 04 Oct 2008 If you’re using Git, you’re probably aware of submodules.

Subtree merging and you

They’re useful when you want to integrate and track another Git repository into your own. But there are two other options at your disposal. The first one is to simply merge the other repository. This works fine as long as there are no conflicting files, but chances are there already are or will be in the future, which makes this option not too useful. This is where the subtree merge strategy comes in. Here’s how you set it up. Git. One of the things I didn't touch on at all in the book is the git rerere functionality.


This also came up recently during one of my trainings, and I realize that a lot of people probably could use this, so I wanted to let you all now about it. The git rerere functionality is a bit of a hidden feature (Git actually has a lot of cool hidden features, if you haven't figured that out yet). The name stands for "reuse recorded resolution" and as the name implies, it allows you to ask Git to remember how you've resolved a hunk conflict so that the next time it sees the same conflict, Git can automatically resolve it for you. There are a number of scenarios in which this functionality might be really handy. One of the examples that is mentioned in the documentation is if you want to make sure a long lived topic branch will merge cleanly but don't want to have a bunch of intermediate merge commits. To enable the rerere functionality, you simply have to run this config setting: