git

Tweaking git history with git rebase

February 3, 2022
git

Git rebase can be used as a powerful tool to tweak the git history, this post log basic git rebase usage with an example that removes large files from git. The Error Message # So, you just tried to run git push, and after taking longer than usual, you get an error trace like this one: remote: error: GH001: Large files detected. You may want to try Git Large File Storage - https://git-lfs. ...

Git side-by-side diff in tig with meld

January 20, 2022
git

Side-by-side diffs are more readable to me than in-line diffs.

Long time ago, I started using Meld to display them when working with git. But I always needed to manually specify branch or commit names. This week I finally spent some time and found a way to invoke Meld directly from tig, so that I can see the diff side-by-side while browsing a commit history in tig (for example, when I want to review a proposed branch containing 10 new commits, and I want to inspect each of them individually). Here’s a short howto.

...

Git Submodule

July 17, 2018
git

基于公司的项目会越来越多,常常需要提取公共的library提供给多个项目使用,但是这个library怎么和git在一起方便管理呢?

我们需要解决下面几个问题:

  • 如何在git项目中导入library?
  • library在其他的项目中被修改了可以更新到远程的代码库中?
  • 其他项目如何获取到library最新的提交?
  • 如何在clone的时候能够自动导入library?

解决以上问题,可以考虑使用git的submodule来解决。

...