1. 29 Dec, 2016 2 commits
  2. 02 Dec, 2016 1 commit
    • git_rebase_init: correctly handle detached HEAD · 4db1fc7e
      git_rebase_finish relies on head_detached being set, but
      rebase_init_merge was only setting it when branch->ref_name was unset.
      But branch->ref_name would be set to "HEAD" in the case of detached
      HEAD being either implicitly (NULL) or explicitly passed to
      git_rebase_init.
      David Turner committed
  3. 06 Oct, 2016 1 commit
  4. 01 Jun, 2016 1 commit
    • rebase: change assertion to avoid · 4505a42a
      It looks like we're getting the operation and not doing anything
      with it, when in fact we are asserting that it's not null.  Simply
      assert that we are within the operation boundary instead of using
      the `git_array_get` macro to do this for us.
      Edward Thomson committed
  5. 03 May, 2016 1 commit
  6. 21 Apr, 2016 2 commits
  7. 23 Feb, 2016 1 commit
  8. 15 Feb, 2016 1 commit
  9. 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
  10. 12 Jul, 2015 1 commit
  11. 09 Jun, 2015 1 commit
  12. 20 Apr, 2015 5 commits
  13. 03 Mar, 2015 3 commits
  14. 27 Feb, 2015 1 commit
  15. 14 Feb, 2015 2 commits
  16. 13 Feb, 2015 3 commits
  17. 12 Feb, 2015 1 commit
  18. 30 Dec, 2014 1 commit
  19. 29 Dec, 2014 1 commit
  20. 06 Dec, 2014 1 commit
  21. 27 Oct, 2014 8 commits