Hi Stefan,
On Mon, 14 Mar 2016, Stefan Beller wrote:
> #TIL you cannot run rebase in a bare repository(, yet). I would have
> assumed you could.
Every rebase bears the chance of merge conflicts. You need a working
directory to resolve those.
Ciao,
Dscho
--
To unsubscribe from this list: send th
On Sat, Mar 12, 2016 at 2:46 AM, Paul Tan 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" ?
> @@ -505,9
Signed-off-by: Paul Tan
---
Makefile | 5 +
builtin.h| 1 +
builtin/rebase.c | 31 +++
git.c| 1 +
4 files changed, 34 insertions(+), 4 deletions(-)
create mode 100644 builtin/rebase.c
diff --git a/Makefile b/Makefile
index 24bef8d.
3 matches
Mail list logo