• e9c00be...2652a00 garment-quiz -> garment-quiz (forced update)
  • d91922d...2fec250 release-2012-07-04 -> release-2012-07-04 (forced update)

fix:
git push origin d91922d:release-2012-07-04

This document is an attempt to be a fairly comprehensive guide to recovering from what you did not mean to do when using git. It isn't that git is so complicated that you need a large document to take care or your particular problem, it is more that the set of things that you might have done is so large that different techniques are needed depending on exactly what you have done and what you want to have happen.

Gitchain is an application of the exciting ideas behind Bitcoin, Namecoin and DHT applied to Git hosting. Once you install it, it acts as a local proxy to the entire Gitchain P2P network.

Un git merge ne devrait être utilisé que pour la récupération fonctionnelle, intégrale et finale d’une branche dans une autre, afin de préserver un graphe d’historique sémantiquement cohérent et utile, lequel représente une véritable valeur ajoutée.

Tous les autres cas de figure relèvent du rebase sous toutes ses formes : classique, tri-partite, interactif ou cherry picking.

Some git tips

Stage by hunks

Multiple server for git

Occasionally I dropped a DVD-rip into a website project, then carelessly git commit -a -m ..., and, zap, the repo was bloated by 2.2 gigs. Next time I made some edits, deleted the video file, and commited everything, but the compressed file is still there in the repository, in history.

With Git, you never really lose anything; even if you’ve done a filter-branch to re-write history, you’re only a reflog entry away from getting it all back.

Pull request by hand ?

Speed up git/ssh connection by keeping an open connection to the serv

Automatictly take screenshot of website at every commit, to see changes