Git - Auto rebase while pushing

Question

While working on a git project, I want to run a git pull --rebase before each git push. However, some developers in my team often forget to call git pull --rebase before pushing. So, Git/Gerrit automatically performs a merge which creates a malformed commit message.I want to avoid this auto merging.

I want to configure clients git so that when developers run a git push, a git pull --rebase should automatically occurs. Is there any way?

Trivially, you could make all your developers create an alias that does this and publicly shame anyone who doesn't use it instead of `git push`. :P — merlin2011, Apr 17 '17 at 07:08
More seriously though, what do you mean by *setup git*? Technically, all the client's git configurations are part of git. — merlin2011, Apr 17 '17 at 07:09

score 4 · Accepted Answer · edited May 23 '17 at 11:46

4

Tell all your developers to add the following to their .git/config files after cloning. Then require all of them to use git goodpush instead of git push.

[alias]
        goodpush = "!git pull --rebase && git push"

This configuration can also be placed inside the .gitconfig file in the user's home directory to avoid doing it for each repository that is cloned.

Note that the name of the alias cannot be push, for reasons discussed here, so you will have to provide some incentives or train your developers to no longer use push directly.

On the plus side, since you get a malformed commit message whenever somebody does use push accidentally, you will immediately know whom to speak with if such a use occurs.

edited May 23 '17 at 11:46

Community

1
1

answered Apr 17 '17 at 07:12

merlin2011

71,677
44
195
329

@SazzadHissainKhan, Not in the current implementation, no. You would have to pass arguments appropriately based on what arguments you expect and want to pass to each of the two commands. – merlin2011 Apr 17 '17 at 07:22
1

how arguments are used in aliases? – Sazzad Hissain Khan Apr 17 '17 at 07:23
@SazzadHissainKhan, That is addressed [here](http://stackoverflow.com/q/3321492/391161). Please note the comments under the question and each answer before using it. – merlin2011 Apr 17 '17 at 07:24
You are awesome! @merlin2011 – Sazzad Hissain Khan Apr 17 '17 at 07:26
1

@SazzadHissainKhan, Thanks and good luck training your developers to switch! :) – merlin2011 Apr 17 '17 at 07:28
In case working with arguments, use `git config --global alias.goodpush '!rebaseAndPush() { git pull --rebase && git push origin HEAD:refs/for/$1; }; rebaseAndPush'` – Sazzad Hissain Khan Apr 17 '17 at 09:24

Git - Auto rebase while pushing

1 Answers1