master updated (2e85ac2b270 -> 3ce462c8fda)

[Jim Porter]

jporter pushed a change to branch master.

      from  2e85ac2b270 Add new Tramp method "flatpak"
       new  9914de503bd Improve the logic of the file entry Git hooks to 
support more cases
       new  e26dcc0e144 ; Fix logic of Git pre-push hook when pushing a new 
branch
       new  3ce462c8fda When examining merge commits in our Git hooks, only 
check the first parent


Summary of changes:
 build-aux/git-hooks/commit-msg-files.awk | 33 +++++++++++++++++++++++---------
 build-aux/git-hooks/pre-push             | 27 ++++++++++++++------------
 2 files changed, 39 insertions(+), 21 deletions(-)