[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: git pre-commit hook for merges (WAS: master has switched from Automa
|
From: |
Eli Zaretskii |
|
Subject: |
Re: git pre-commit hook for merges (WAS: master has switched from Automake to GNU Make) |
|
Date: |
Sat, 29 Apr 2017 22:15:41 +0300 |
> From: Paul Eggert <address@hidden>
> Date: Sat, 29 Apr 2017 11:44:06 -0700
> Cc: martin rudalics <address@hidden>, emacs-devel <address@hidden>,
> Andreas Schwab <address@hidden>, Yuri Khan <address@hidden>
>
> Noam Postavsky wrote:
> > Since git only runs the hooks on the merged changes when you pass
> > --no-commit to 'git merge', defaulting to non-blind merge doesn't
> > really work anyway.
>
> Thanks for looking into this. I guess I'll have to rethink how I merge.
Not sure it matters in the context of this discussion, but please keep
in mind that "git cherry-pick" also merges.
Re: git pre-commit hook for merges (WAS: master has switched from Automake to GNU Make), Noam Postavsky, 2017/04/29
- Re: git pre-commit hook for merges (WAS: master has switched from Automake to GNU Make), Paul Eggert, 2017/04/29
- Re: git pre-commit hook for merges (WAS: master has switched from Automake to GNU Make),
Eli Zaretskii <=
- Re: git pre-commit hook for merges (WAS: master has switched from Automake to GNU Make), Noam Postavsky, 2017/04/29
- Re: git pre-commit hook for merges (WAS: master has switched from Automake to GNU Make), Eli Zaretskii, 2017/04/29
- Re: git pre-commit hook for merges (WAS: master has switched from Automake to GNU Make), Noam Postavsky, 2017/04/29
- Re: git pre-commit hook for merges (WAS: master has switched from Automake to GNU Make), Eli Zaretskii, 2017/04/29
- Re: git pre-commit hook for merges (WAS: master has switched from Automake to GNU Make), Noam Postavsky, 2017/04/30
- Re: git pre-commit hook for merges (WAS: master has switched from Automake to GNU Make), Eli Zaretskii, 2017/04/30