4 Commits

Author	SHA1	Message	Date
Edward Thomson	5acf18ac63	rebase: test rebasing a new commit with subfolder ... Test a rebase (both a merge rebase and an inmemory rebase) with a new commit that adds files underneath a new subfolder.	2016-06-02 02:38:18 -05:00
Edward Thomson	c7b4bbffcc	rebase: test rebase (merge) w/ no common ancestor	2016-05-03 15:29:44 -04:00
Edward Thomson	f28bae0c38	rebase: persist a single in-memory index ... When performing an in-memory rebase, keep a single index for the duration, so that callers have the expected index lifecycle and do not hold on to an index that is free'd out from under them.	2016-02-15 19:27:06 +00:00
Edward Thomson	ee6673070a	rebase: introduce inmemory rebasing ... Introduce the ability to rebase in-memory or in a bare repository. When `rebase_options.inmemory` is specified, the resultant `git_rebase` session will not be persisted to disk. Callers may still analyze the rebase operations, resolve any conflicts against the in-memory index and create the commits. Neither `HEAD` nor the working directory will be updated during this process.	2016-02-11 10:48:48 -08:00