「こわくない Git」というスライドを発表しました - kotas.tech
社内向けに「こわくない Git」というタイトルのスライドを作って発表しました。 対象者は「マージがなんとなく怖い」「エラーが怖い」「リベース使うなって言われて怖い」と、Git が怖いと思っている人です！ こわくない Git from Kota Saito 発表中に出た質問など 補足も兼ねて、上のスライドを発表した際に出た質疑応答などをここに書いておきます。 Q: 常に Non Fast-Forward (--no-ff) でいいのでは、と思えるけど git merge がデフォルトだと Fast-Foward or Non Fast-Forward (--ff) なのはなぜ？ A1: Non Fast-Forward だと、確かにメリットが多いのですが、1点だけデメリットがあります。特に差分が無い状態で git merge --no-ff すると、空のマージコミットが作られてしまうのです。
A successful Git branching model » nvie.com
Note of reflection (March 5, 2020) This model was conceived in 2010, now more than 10 years ago, and not very long after Git itself came into being. In those 10 years, git-flow (the branching model laid out in this article) has become hugely popular in many a software team to the point where people have started treating it like a standard of sorts — but unfortunately also as a dogma or panacea. Du
A few git tips you didn't know about
Notice: some of these commands or flags require git version 1.7.2. On OS X, upgrade easily with Homebrew: brew install git Show branches, tags in git log 7466000 (HEAD, mislav/master, mislav) fix test that fails if current dir is not "hub" 494a414 fix cherry-pick of a commit URL 4277848 (origin/master, origin/HEAD, master) whoops d270fae bugfix: git init -g 9307af3 test deps 8ccc17e http://github.
A Git Workflow for Agile Teams - reinh.com
An efficient workflow for developers in Agile teams that handles features and bugs while keeping a clean and sane history. At Hashrocket we use git both internally and in our Agile mentoring and training. Git gives us the flexibility to design a version control workflow that meets the needs of either a fully Agile team or a team that is transitioning towards an Agile process. There are many usable
RSpec の入門とその一歩先へ - t-wada の日記（旧）
和田 卓人(@t_wada) 作『RSpec の入門とその一歩先へ』はクリエイティブ・コモンズ 表示 - 継承 4.0 国際 ライセンスで提供されています。 東京 Ruby 会議 03 の RSpec ワークショップの資料です。このワークショップでは参加者の方に「写経」(コードを書き写すこと)をして貰い、TDD/BDD と RSpec を同時に学べるように都度説明を入れるかたちで行いました。 第2イテレーションも書きました。続きに興味ある方はご覧下さい (更新) 第3イテレーションも書きました。続きに興味ある方はご覧下さい 1st iteration favotter の みたいな NG ワードのフィルタリング機能を RSpec で作りましょう。まずは NG ワードの検出機能を作成します。 このイテレーションでは最初ベタな形のテストコードと実装を書き、だんだんとそのコードを洗練させてゆきま
While it's tempting to take a DIY approach to plumbing problems, there are times when it's best to call in a professional plumber.
Green plumbing is another area of modern plumbing that has gained popularity. This type of plumbing focuses on reducing the environmental impact of plumbing systems. For example, green plumbing may include the use of solar water heaters, rainwater harvesting systems, or composting toilets. Find more information about baderom. Long In conclusion, the history of plumbing is a long and fascinating on
cloudhead.io
toto the tiniest blogging engine in Oz! introduction toto is a git-powered, minimalist blog engine for the hackers of Oz. The engine weighs around ~230 sloc at its worst. There is no toto client, at least for now; everything goes through git. blog in 10 seconds $ cd myblog $ git clone git://github.com/cloudhead/dorothy.git . $ heroku create $ git push heroku master philosophy Everything that can b
In praise of git's index // plasmasturm.org
I still run into people lambasting Git for the concept of the index from time to time. It seems strange and superfluous to users of other VCSs – like a speed bump that serves no purpose. Why not just commit the changes in the working copy? This perception is understandable; when I first heard of Git, back as a Subversion user, I was one of these people. How times and minds change. Today, I use it
Persistent Trees in git, Clojure and CouchDB « EclipseSource Blog
This is a tale of three images. I found these images while investigating the internals of several different applications. There are some really neat software projects emerging at the moment, and as a developer I always find it interesting to take a look at the implementation details, because there is often a lot to be learned. It’s not always something you might need right now, but maybe a few yea
Setting up Gitorious on your own server / Ruby - cjohansen.no
Gitorious is an open source Rails application for managing your projects: Git repositories, wikis, timeline and more. Not identical to, but not completely unlike GitHub. Being open source means you can set up your own Gitorious, even in private mode and host all your company's projects. In this article I'll show you how to get it running. I am going to guide you through installing Gitorious on an
has_many :through - Agile git and the story branch pattern
I've been using git for source code management for over a year now and I'm totally hooked. I won't rave about all the usual reasons WhyGitIsBetterThanX since it's been done already. Instead, I'm going to share how I use git for easy agile development. The basic idea is to never do anything in the master branch except use it to move changes between the remote repo and local branches. Keeping master
experimentalworks » Blog Archive » Merge vs. Rebase – A deep dive into the mysteries of revision control
Merge vs. Rebase – A deep dive into the mysteries of revision control I remember the days when I started learning Git about two years ago. I crawled through all the available commands and read the man pages what they are for and I remember when I stumbled over rebase and stuck. After figuring out what it actually does, I start loving it, but didn’t understand it’s dangerousness until someday I som
Accueil
Dans le monde des jeux en ligne, les plateformes gratuites ont su séduire un large public et connaissent une popularité croissante. Des jeux vidéo en passant par les sites de casino en ligne, nombreux sont ceux qui ont su tirer profit de cette tendance. Pourquoi les jeux en ligne gratuits remportent-ils un tel succès auprès des Français ? Quels... L’utilisation du robot de trading fait rêver de pl
Linus's ultimate content tracking tool
11:27 pm - Linus's ultimate content tracking tool I have kept saying that message number 217 in gmane archive is the most important message in the entire life of the git mailing list. I still think it is, and more importantly, it certainly was one of the most influential messages that shaped the various design decisions in git. Understanding of the ideas described in it may reveal the secrets behi
リリース、障害情報などのサービスのお知らせ
最新の人気エントリーの配信
j次のブックマーク
k前のブックマーク
lあとで読む
eコメント一覧を開く
oページを開く
Presentation
GitHub Services
http://pivotallabs.com/users/rolson/blog/articles/1278-ignoring-tracked-files-in-git
Fun with remote branches (1)
presentation_source_control/keynote at master · jimweirich/presentation_source_control
Git statistics for Linus' kernel tree