To prevent merge conflicts while adding new commands, use a wildcard for the command list. Signed-off-by: Bert Wesarg <bert.wesarg@xxxxxxxxxxxxxx> --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 6eade1e..2c4a67c 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ sharedir = $(PREFIX)/share/topgit hooksdir = $(cmddir)/hooks -commands_in = tg-create.sh tg-delete.sh tg-export.sh tg-info.sh tg-patch.sh tg-summary.sh tg-update.sh +commands_in = $(wildcard tg-*.sh) hooks_in = hooks/pre-commit.sh commands_out = $(patsubst %.sh,%,$(commands_in)) -- tg: (f27e693..) t/use-wildcard-for-commands_in (depends on: master) -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html