GOMP, a tool for comparing Git branches

栏目: IT技术 · 发布时间: 4年前

内容简介:GOMP is a Git-based tool for comparing branches, designed to work with a rebase-oriented Git workflow. Markforged uses GOMP as both a daily tool for handling commits and merges and as a powerful way to visualize complex histories while preparing releases.R

GOMP (Git cOMPare)

GOMP is a Git-based tool for comparing branches, designed to work with a rebase-oriented Git workflow. Markforged uses GOMP as both a daily tool for handling commits and merges and as a powerful way to visualize complex histories while preparing releases.

GOMP, a tool for comparing Git branches

Read about the Markforged Git workflow on our software engineering blog.

Installing GOMP

GOMP is based on Python 3 and has no dependencies outside of the Python standard library. It is available for installation over pip:

$ pip install gomp

Alternately, you can clone the repository and include the following alias in your shell profile:

$ alias gomp="python /path/to/gomp/gomp.py"

Gomp has been tested on MacOS only but should be compatible with most flavors of Linux.

Using GOMP

With gomp installed, navigate to any directory that has a git repository with multiple branches. Our hypothetical repository has two branches: feature and main . Run:

$ gomp feature main

This command shows a visual comparison between the two branches.

Use the flag --key to see a key explaining the color codes.

Use the flag --recut to receive output that, when entered into an interactive rebase, will put commits from feature on top of commits from main .

GOMP's output is color-coded:

  • Green text means that the commit matches between branches.
  • Yellow text means that a commit on the both branches but the commits are in a different order.
  • Red text means that a commit is on the target branch and not the source branch.
  • Purple text means that a commit is on the source branch and not the target branch.

Contributing to GOMP

Thank you for wanting to help us improve GOMP. Markforged welcomes pull requests to improve GOMP's functionality, reliability, and ease of use. All contributions are subject to our guidelines.

You can learn more about the process of preparing an internal tool for public use on our engineering blog .

The Python 2 version of GOMP is not under active development and is accepting bug fixes only.

GOMP has no dependencies outside of the Python standard library, we'd like to keep it that way.

License

GOMP is released by Markforged under the MIT License .


以上就是本文的全部内容,希望对大家的学习有所帮助,也希望大家多多支持 码农网

查看所有标签

猜你喜欢:

本站部分资源来源于网络,本站转载出于传递更多信息之目的,版权归原作者或者来源机构所有,如转载稿涉及版权问题,请联系我们

MFC编程技巧与范例详解

MFC编程技巧与范例详解

曾凡锋、苗雨 / 清华大学出版社 / 2008-10 / 45.00元

本书集作者多年教学与软件开发经验,通过不同类型的实例详解向读者解读了如何使用MFC进行软件开发,并按实例的复杂度进行分级介绍,以满足不同层次读者的切实需要。. 本书共55个完整实例,均选自作者多年工程应用开发中的案例;内容共分14章,分别为MFC的基本概念、文档和视图、对话框、按钮控件、编辑控件、组合框控件、列表框控件、列表视图控件、树状视图控件、图像、多媒体、GDI与GDI+、网络编程、I......一起来看看 《MFC编程技巧与范例详解》 这本书的介绍吧!

图片转BASE64编码
图片转BASE64编码

在线图片转Base64编码工具

URL 编码/解码
URL 编码/解码

URL 编码/解码

HEX CMYK 转换工具
HEX CMYK 转换工具

HEX CMYK 互转工具