Re: [PATCH v2 18/31] rebase: extract merge code to new source file
From: Jeff King <hidden>
Date: 2016-06-15 22:50:39
On Thu, Feb 24, 2011 at 10:32:06PM -0500, Martin von Zweigbergk wrote:
Subject: [PATCH] Makefile: do not install sourced rebase scripts When git-rebase.sh recently started sourcing git-rebase--interactive.sh instead of executing it, executable bit of the latter file should have been turned off and it should have been moved from SCRIPT_SH to SCRIPT_LIB in the Makefile. Its two new siblings, git-rebase--am.sh and git-rebase--merge.sh (whose executable bits are already off) should also be moved to SCRIPT_LIB in the Makefile.
Looks right, but...
quoted hunk ↗ jump to hunk
@@ -382,6 +379,9 @@ SCRIPT_SH += git-web--browse.sh SCRIPT_LIB += git-mergetool--lib SCRIPT_LIB += git-parse-remote SCRIPT_LIB += git-sh-setup +SCRIPT_LIB += git-rebase--am.sh +SCRIPT_LIB += git-rebase--interactive.sh +SCRIPT_LIB += git-rebase--merge.sh
We usually keep these sorted. -Peff