https://github.com/yairchu/git-utils

Small helpers for using git
https://github.com/yairchu/git-utils

conflict-resolution git merge

Last synced: 23 days ago
JSON representation

Small helpers for using git

• Host: GitHub
• URL: https://github.com/yairchu/git-utils
• Owner: yairchu
• License: mit
• Created: 2020-11-29T14:10:00.000Z (almost 4 years ago)
• Default Branch: main
• Last Pushed: 2023-09-28T11:39:06.000Z (about 1 year ago)
• Last Synced: 2023-09-28T13:45:25.548Z (about 1 year ago)
• Topics: conflict-resolution, git, merge
• Language: Python
• Homepage:
• Size: 30.3 KB
• Stars: 0
• Watchers: 3
• Forks: 0
• Open Issues: 0
• Metadata Files:
  • Readme: README.md
  • License: LICENSE

Awesome Lists containing this project

README

        
# git-utils

Small helpers for using git

## `sub-rebase`

Rebase gradually: replay branch commits over newer commits on target branch, to handle the conflicts in smaller units.

See post: [Break big merges to smaller pieces](https://yairchu.github.io/posts/split-merge-to-smaller-pieces)

## `sub-merge.sh`

A merging variant of `sub-rebase.sh`

## `git-w.py`

A tool to normalize line endings to reduce diffs.

It may normalize line endings to either '\n' (unix) or '\r\n' (windows)

depending on which one best reduces the diff size.

## `submodules-dedup.py`

A tool to avoid recloning submodules that are repeated across different repositories.