сяу

[juan_gandhi]

git commit .

Источник: Git в реальной жизни


Comments

[juan_gandhi]

cli for small things, IntelliJ for smart merging, stashing and unstashing. That's all I need, for many years.

[lomeo]

Wow, it looks a bit scanty to me.

cherry-picking? rebase? fixup commits? commit-to-branch? routine operations like merge-PR-delete-remote-branch-delete-local-branch-pull-master? regular things.

https://github.com/nvie/git-toolbelt
https://github.com/wfxr/forgit

[juan_gandhi]

I have a pretty negative attitude to cherry-picking. Rebase - no big deal. No clue what "fixup commit" is.

The rest is in cli and in scripts.

>cat ~/nb
git fetch
git branch "$1" origin/master

>cat push
git commit -a -m "$1" && git push

That's all I do (this is my home machine; a bit more complicated on my work machine).

[lomeo]

This is the Way :) It should be in your own scripts, right.

By fixup commit I meant

> git commit --fixup=COMMITHASH
> git rebase --autosquash ...

[lomeo]

About cherry-picking. That's right, this tool is definitely sloppy, we lose control over history, the commits are unrelated.

But it's extremely helpful when you need to copy fixes from the developer branch to the release branch. And shit happens, you know.

[juan_gandhi]

Спасибо за линки! Интересные штучки. Поизучаю.