Re: [PATCH/RFC/GSoC 03/17] builtin-rebase: implement skeletal builtin rebase
- From
Stefan Beller <sbeller@google.com>
- Date
- Mar 14, 2016, 18:31 UTC
- Message-ID
- <CAGZ79ka64xBABfsWtX6GmK+sdy=VziZeGBKz9A3V=jX9ZcyfyA@mail.gmail.com>
- In-Reply-To
- <1457779597-6918-4-git-send-email-pyokagan@gmail.com>
On Sat, Mar 12, 2016 at 2:46 AM, Paul Tan <pyokagan@gmail.com> wrote:
"Unlike when doing git-am, "git am" kept working during the whole series
and being switched from the shell to the C implementation in the
last commit,
this time rebase is broken in the series, and built up from here again" ?Show 7 quoted lines
> @@ -505,9 +504,6 @@ SCRIPT_SH += git-web--browse.sh > > SCRIPT_LIB += git-mergetool--lib > SCRIPT_LIB += git-parse-remote > -SCRIPT_LIB += git-rebase--am > -SCRIPT_LIB += git-rebase--interactive > -SCRIPT_LIB += git-rebase--merge
You would also want to retire these files to the contrib directory in the same patch as you unlink them from the build process?
> { "read-tree", cmd_read_tree, RUN_SETUP },
> + { "rebase", cmd_rebase, RUN_SETUP | NEED_WORK_TREE },#TIL you cannot run rebase in a bare repository(, yet). I would have assumed you could.