Re: [PATCH v3 4/4] builtin/rebase: support running "git rebase <upstream>"
- From
Beat Bolli <dev+git@drbeat.li>
- Date
- Jul 17, 2018, 21:49 UTC
- Message-ID
- <ae561025-3e99-0e4a-569a-c1ff1f2a2e58@drbeat.li>
- In-Reply-To
- <20180706120815.17851-5-predatoramigo@gmail.com>
On 06.07.18 14:08, Pratik Karki wrote:
> +static GIT_PATH_FUNC(apply_dir, "rebase-apply"); > +static GIT_PATH_FUNC(merge_dir, "rebase-merge");
Maybe fix this up with
-static GIT_PATH_FUNC(apply_dir, "rebase-apply"); -static GIT_PATH_FUNC(merge_dir, "rebase-merge"); +static GIT_PATH_FUNC(apply_dir, "rebase-apply") +static GIT_PATH_FUNC(merge_dir, "rebase-merge")
?
(See https://public-inbox.org/git/20180709192537.18564-5-dev+git@drbeat.li/#t)
Cheers, Beat