Skip to main content

Browse the archive

Revision 366d2d5f485c7d0b288520c4f7249e0380c5a9b3 authored by Junio C Hamano on 10 August 2016, 18:55:26 UTC, committed by Junio C Hamano on 10 August 2016, 18:55:26 UTC 
Merge branch 'da/subtree-2.9-regression' into maint
 
"git merge" in Git v2.9 was taught to forbid merging an unrelated
lines of history by default, but that is exactly the kind of thing
the "--rejoin" mode of "git subtree" (in contrib/) wants to do.
"git subtree" has been taught to use the "--allow-unrelated-histories"
option to override the default.

* da/subtree-2.9-regression:
  subtree: fix "git subtree split --rejoin"
  t7900-subtree.sh: fix quoting and broken && chains
2 parent s d9d7ab3 + 0f12c7d
Raw File
sigchain.h 
#ifndef SIGCHAIN_H
#define SIGCHAIN_H

typedef void (*sigchain_fun)(int);

int sigchain_push(int sig, sigchain_fun f);
int sigchain_pop(int sig);

void sigchain_push_common(sigchain_fun f);
void sigchain_pop_common(void);

#endif /* SIGCHAIN_H */
back to top