1. 03 Mar, 2017 1 commit
    • rebase: ignore untracked files in submodules · 2270ca9f
      An untracked file in a submodule should not prevent a rebase from
      starting.  Even if the submodule's SHA is changed, and that file would
      conflict with a new tracked file, it's still OK to start the rebase
      and discover the conflict later.
      
      Signed-off-by: David Turner <dturner@twosigma.com>
      David Turner committed
  2. 17 Dec, 2016 1 commit
  3. 02 Dec, 2016 1 commit
  4. 02 Jun, 2016 1 commit
  5. 03 May, 2016 1 commit
  6. 26 Apr, 2016 1 commit
  7. 21 Apr, 2016 2 commits
  8. 29 Feb, 2016 1 commit
  9. 17 Feb, 2016 1 commit
  10. 15 Feb, 2016 1 commit
  11. 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
  12. 30 Apr, 2015 1 commit
  13. 20 Apr, 2015 7 commits
  14. 03 Mar, 2015 2 commits
  15. 13 Feb, 2015 2 commits
  16. 07 Dec, 2014 1 commit
  17. 06 Dec, 2014 1 commit
  18. 27 Oct, 2014 13 commits