1. 11 Feb, 2016 2 commits
    • rebase: allow custom merge_options · a202e0d4
      Allow callers of rebase to specify custom merge options.  This may
      allow custom conflict resolution, or failing fast when conflicts
      are detected.
      Edward Thomson committed
    • rebase: introduce inmemory rebasing · ee667307
      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.
      Edward Thomson committed
  2. 12 Jul, 2015 1 commit
  3. 09 Jun, 2015 1 commit
  4. 20 Apr, 2015 5 commits
  5. 03 Mar, 2015 3 commits
  6. 27 Feb, 2015 1 commit
  7. 14 Feb, 2015 2 commits
  8. 13 Feb, 2015 3 commits
  9. 12 Feb, 2015 1 commit
  10. 30 Dec, 2014 1 commit
  11. 29 Dec, 2014 1 commit
  12. 06 Dec, 2014 1 commit
  13. 27 Oct, 2014 17 commits