Automating commit amend procedure

Question

I am finding myself annoyed at having to run the full procedure to amend commits in git and I was wondering which was the best way of automate them. So, instead of doing this:

$> git add .
$> git commit --amend
$> git push -f

I'd love to do this

$> amend_commit

Is shell scripting the only way to do it? I am using ZSH.

Thank you all.

why would you force-push amended commits? That sounds quite bad. — eis, May 22 '17 at 13:46

score 1 · Accepted Answer · answered May 22 '17 at 13:51

1

While it is a pretty bad idea to automate a forced push, as it rewrites the history and everyone else working with the same repository will hate you, you can also define a git alias instead of a shell alias like

git config alias.amend '!git add . && git commit --amend && git push -f'

or if you don't want to edit the commit message, then

git config alias.amend '!git add . && git commit --amend -C HEAD && git push -f'

and then you can do git amend to use it.

answered May 22 '17 at 13:51

Vampire

35,631
4
76
102

Thanks! This would work perfectly! Luckily my company's workflow does not involve working shared branches so I can force push as much as I want without being hated! :) – antogilbert May 22 '17 at 13:58
Then you are probably fine. :-) – Vampire May 22 '17 at 14:00

score 0 · Answer 2 · answered May 22 '17 at 13:43

0

You can just create an alias. This should work:

alias amend_commit="git add . && git commit --amend && git push -f"

answered May 22 '17 at 13:43

Christopher Schneider

3,745
2
24
38

Something this complicated should be a function instead of an alias. – chepner May 26 '17 at 14:30

score 0 · Answer 3 · answered May 22 '17 at 13:50

You can cut out one of the steps by using the -a flag to git commit to auto-add any changes:

git commit -a --amend
git push -f

As another user has already commented, it seems dangerous to fold an automatic force-push into this workflow.

Amending an already pushed branch is advised against. I'd say it is something you should do relatively infrequently, unless you are using a workflow that allows for mutable feature branches (for rebasing, etc).

Automating commit amend procedure

3 Answers3