[GSoC] [PATCH 0/5] rebase: rewrite rebase in C · Pratik Karki <hidden> · 2018-06-28
[PATCH 1/5] Start TODO-rebase.sh · Pratik Karki <hidden> · 2018-06-28
Re: [PATCH 1/5] Start TODO-rebase.sh · Pratik Karki <hidden> · 2018-06-28
[PATCH 2/5] rebase: start implementing it as a builtin · Pratik Karki <hidden> · 2018-06-28
Re: [PATCH 2/5] rebase: start implementing it as a builtin · Christian Couder <hidden> · 2018-06-28
Re: [PATCH 2/5] rebase: start implementing it as a builtin · Stefan Beller <hidden> · 2018-06-28
[PATCH 3/5] rebase: refactor common shell functions into their own file · Pratik Karki <hidden> · 2018-06-28
Re: [PATCH 3/5] rebase: refactor common shell functions into their own file · Christian Couder <hidden> · 2018-06-28
Re: [PATCH 3/5] rebase: refactor common shell functions into their own file · Stefan Beller <hidden> · 2018-06-28
[PATCH 4/5] sequencer: refactor the code to detach HEAD to checkout.c · Pratik Karki <hidden> · 2018-06-28
Re: [PATCH 4/5] sequencer: refactor the code to detach HEAD to checkout.c · Christian Couder <hidden> · 2018-06-28
Re: [PATCH 4/5] sequencer: refactor the code to detach HEAD to checkout.c · Stefan Beller <hidden> · 2018-06-28
[PATCH 5/5] builtin/rebase: support running "git rebase <upstream>" · Pratik Karki <hidden> · 2018-06-28
Re: [PATCH 5/5] builtin/rebase: support running "git rebase <upstream>" · Stefan Beller <hidden> · 2018-06-28
[GSoC] [PATCH v2 0/4] rebase: rewrite rebase in C · Pratik Karki <hidden> · 2018-07-02
[PATCH v2 1/4] rebase: start implementing it as a builtin · Pratik Karki <hidden> · 2018-07-02
[PATCH v2 2/4] rebase: refactor common shell functions into their own file · Pratik Karki <hidden> · 2018-07-02
[PATCH v2 3/4] sequencer: refactor the code to detach HEAD to checkout.c · Pratik Karki <hidden> · 2018-07-02
[PATCH v2 4/4] builtin/rebase: support running "git rebase <upstream>" · Pratik Karki <hidden> · 2018-07-02
[GSoC] [PATCH v3 0/4] rebase: rewrite rebase in C · Pratik Karki <hidden> · 2018-07-06
[PATCH v3 1/4] rebase: start implementing it as a builtin · Pratik Karki <hidden> · 2018-07-06
[PATCH v3 2/4] rebase: refactor common shell functions into their own file · Pratik Karki <hidden> · 2018-07-06
Re: [PATCH v3 2/4] rebase: refactor common shell functions into their own file · Johannes Schindelin <hidden> · 2018-07-06
[PATCH v3 3/4] sequencer: refactor the code to detach HEAD to checkout.c · Pratik Karki <hidden> · 2018-07-06
[PATCH v3 4/4] builtin/rebase: support running "git rebase <upstream>" · Pratik Karki <hidden> · 2018-07-06
Re: [PATCH v3 4/4] builtin/rebase: support running "git rebase <upstream>" · Christian Couder <hidden> · 2018-07-07
Re: [PATCH v3 4/4] builtin/rebase: support running "git rebase <upstream>" · Johannes Schindelin <hidden> · 2018-07-07
Re: [PATCH v3 4/4] builtin/rebase: support running "git rebase <upstream>" · Beat Bolli <hidden> · 2018-07-17
Re: [PATCH v3 4/4] builtin/rebase: support running "git rebase <upstream>" · Beat Bolli <hidden> · 2018-07-17
[GSoC] [PATCH v4 0/4] rebase: rewrite rebase in C · Pratik Karki <hidden> · 2018-07-08
[PATCH v4 1/4] rebase: start implementing it as a builtin · Pratik Karki <hidden> · 2018-07-08
Re: [PATCH v4 1/4] rebase: start implementing it as a builtin · Andrei Rybak <hidden> · 2018-07-09
Re: [PATCH v4 1/4] rebase: start implementing it as a builtin · Eric Sunshine <hidden> · 2018-07-09
Re: [PATCH v4 1/4] rebase: start implementing it as a builtin · Pratik Karki <hidden> · 2018-07-09
Re: [PATCH v4 1/4] rebase: start implementing it as a builtin · Duy Nguyen <hidden> · 2018-07-22
[PATCH v4 2/4] rebase: refactor common shell functions into their own file · Pratik Karki <hidden> · 2018-07-08
[PATCH v4 3/4] sequencer: refactor the code to detach HEAD to checkout.c · Pratik Karki <hidden> · 2018-07-08
Re: [PATCH v4 3/4] sequencer: refactor the code to detach HEAD to checkout.c · Johannes Schindelin <hidden> · 2018-07-08
Re: [PATCH v4 3/4] sequencer: refactor the code to detach HEAD to checkout.c · Pratik Karki <hidden> · 2018-07-09
[PATCH v4 4/4] builtin/rebase: support running "git rebase <upstream>" · Pratik Karki <hidden> · 2018-07-08
Re: [PATCH v4 4/4] builtin/rebase: support running "git rebase <upstream>" · Johannes Schindelin <hidden> · 2018-07-08
Re: [GSoC] [PATCH v4 0/4] rebase: rewrite rebase in C · Johannes Schindelin <hidden> · 2018-07-08
[GSoC] [PATCH v5 0/3] rebase: rewrite rebase in C · Pratik Karki <hidden> · 2018-07-30
[PATCH v5 1/3] rebase: start implementing it as a builtin · Pratik Karki <hidden> · 2018-07-30
[PATCH v5 2/3] rebase: refactor common shell functions into their own file · Pratik Karki <hidden> · 2018-07-30
[PATCH v5 3/3] builtin/rebase: support running "git rebase <upstream>" · Pratik Karki <hidden> · 2018-07-30
Re: [GSoC] [PATCH v5 0/3] rebase: rewrite rebase in C · Pratik Karki <hidden> · 2018-08-01
[GSoC] [PATCH v6 0/3] rebase: rewrite rebase in C · Pratik Karki <hidden> · 2018-08-06
[GSoC] [PATCH v6 3/3] builtin/rebase: support running "git rebase <upstream>" · Pratik Karki <hidden> · 2018-08-06
[GSoC] [PATCH v6 2/3] rebase: refactor common shell functions into their own file · Pratik Karki <hidden> · 2018-08-06
[GSoC] [PATCH v6 1/3] rebase: start implementing it as a builtin · Pratik Karki <hidden> · 2018-08-06

Re: [PATCH v3 4/4] builtin/rebase: support running "git rebase <upstream>"

From: Beat Bolli <hidden>
Date: 2018-07-17 21:49:22

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

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help