❤ Git

【持续翻译】

Git – local branching on the cheap.

  • branch :分支
  • on the cheap:经济地

Git – ldistributed is the new centralized.

  • centralized:集中式

Git – ldistributed even if your workflow isn’t.

  • workflow :工作流程

Git – fast version control

Git – everything is local

Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency.

  • distributed:分布式

Git is easy to learn and has a tiny footprint with lightning fast performance.

  • footprint:脚印,封装
  • lightning:闪电
  • performance:性能

It outclasses SCM tools like Subversion, CVS, Perforce, and ClearCase with features like cheap local branching, convenient staging areas, and multiple workflows.

  • SCM :Supply Chain Management,供应链关系管理
  • outclasse :远优于
  • Subversion:颠覆
  • Apache Subversion:版本控制
  • CVS :Concurrent Version System,计算机并行版本系统
  • Perforce :必然的,版本控制软件,软体配置
  • ClearCase :配置管理工具
  • features :n. 产品特点,特征,嘴脸
  • convenient : 便捷的,实用的
  • staging :n.分段运输,~ area 分区级
  • multiple :多重,多种

About

Branching and Merging

The Git feature that really makes it stand apart from nearly every other SCM out there is its branching model.

  • feature :特性
  • stand apart from :脱离,区别开
  • branching mode : 分支模型

Git allows and encourages you to have multiple local branches that can be entirely independent of each other.

  • entirely :完全地,彻底地
  • independent :独立,独立主义者

The creation, merging, and deletion of those lines of development takes seconds.

  • creation:创建
  • merging:合并
  • deletion :删除

This means that you can do things like:

Frictionless Context Switching. Create a branch to try out an idea, commit a few times, switch back to where you branched from, apply a patch, switch back to where you are experimenting, and merge it in.

  • Frictionless :无摩擦的
  • Switching :转换
  • try out :试验;提炼;考验
  • patch :碎片
  • experimenting :乐于尝试的
  • merge … in :合并

Role-Based Codelines. Have a branch that always contains only what goes to production, another that you merge work into for testing, and several smaller ones for day to day work.

  • day to day:日复一日

Feature Based Workflow. Create new branches for each new feature you’re working on so you can seamlessly switch back and forth between them, then delete each branch when that feature gets merged into your main line.

  • seamlessly :无缝地

  • forth :向前/外

    Disposable Experimentation. Create a branch to experiment in, realize it’s not going to work, and just delete it - abandoning the work—with nobody else ever seeing it (even if you’ve pushed other branches in the meantime).

  • Disposable Experimentation:一次性实验

  • abandoning : 全球

  • meantime:其时

Notably, when you push to a remote repository, you do not have to push all of your branches. You can choose to share just one of your branches, a few of them, or all of them. This tends to free people to try new ideas without worrying about having to plan how and when they are going to merge it in or share it with others.

There are ways to accomplish some of this with other systems, but the work involved is much more difficult and error-prone. Git makes this process incredibly easy and it changes the way most developers work when they learn it.

  • accomplish:完成,实现,达到
  • involved :涉及,包含
  • error-prone :易于出错的
  • incredibly :难以置信地

值得注意的是,当您推送到远程存储库时,您不必推送所有的分支。您可以选择只共享一个分支、几个分支或全部分支。这往往能让人们*地尝试新想法,而不必担心计划如何以及何时将其融入或与他人分享。

使用其他系统可以实现其中的一些功能,但是所涉及的工作要困难得多,而且容易出错。Git使这个过程变得非常简单,并且它改变了大多数开发人员学习它时的工作方式。

Small and Fast

Distributed

Data Assurance

Staging Area

Free and Open Source

Trademark

Documentation

Git教程 - 廖雪峰
❤ Git
elokuu