Git

Здесь обсуждаются темы, косвенно связанные с Far.
Post Reply
User avatar
John Doe
Бюрократ
Posts: 13851
Joined: Wed 27 Apr, 2005 20:42
Has thanked: 73 times
Been thanked: 428 times
Contact:

Git

Post by John Doe »

https://crates.io/crates/git-busy
Image

(гугл находит разные реализации подобной функциональности, например ещё https://github.com/zurawiki/gptcommit, https://github.com/programmarchy/git-gpt)
https://t.me/FarManager — Telegram чат
User avatar
HaRT
Moderator
Posts: 10858
Joined: Tue 30 Aug, 2005 17:21
Has thanked: 221 times
Been thanked: 358 times

Git

Post by HaRT »

Да, теперь надо не забывать объяснять джунам, что в проектах под NDA такие инструменты использовать нельзя. :-)
Фар есть инструмент, а не нянька. © 2009 DrKnS
User avatar
John Doe
Бюрократ
Posts: 13851
Joined: Wed 27 Apr, 2005 20:42
Has thanked: 73 times
Been thanked: 428 times
Contact:

Git

Post by John Doe »

Вот такая штука мне понравилась:
https://github.com/tummychow/git-absorb
You have a feature branch with a few commits. Your teammate reviewed the branch and pointed out a few bugs. You have fixes for the bugs, but you don't want to shove them all into an opaque commit that says fixes, because you believe in atomic commits.
Instead of manually finding commit SHAs for git commit --fixup, or running a manual interactive rebase, do this:

Code: Select all

git add $FILES_YOU_FIXED
git absorb --and-rebase
git absorb will automatically identify which commits are safe to modify, and which staged changes belong to each of those commits. It will then write fixup! commits for each of those changes.

With the --and-rebase flag, these fixup commits will be automatically integrated into the corresponding ones. Alternatively, you can check its output manually if you don't trust it, and then fold the fixups into your feature branch with git's built-in autosquash functionality
https://t.me/FarManager — Telegram чат
Post Reply

Return to “Операционные системы, командные оболочки и прочее”