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. 28 Feb, 2017 1 commit
  3. 13 Feb, 2017 1 commit
    • repository: rename `path_repository` and `path_gitlink` · 84f56cb0
      The `path_repository` variable is actually confusing to think
      about, as it is not always clear what the repository actually is.
      It may either be the path to the folder containing worktree and
      .git directory, the path to .git itself, a worktree or something
      entirely different. Actually, the intent of the variable is to
      hold the path to the gitdir, which is either the .git directory
      or the bare repository.
      
      Rename the variable to `gitdir` to avoid confusion. While at it,
      also rename `path_gitlink` to `gitlink` to improve consistency.
      Patrick Steinhardt committed
  4. 29 Dec, 2016 2 commits
  5. 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
  6. 06 Oct, 2016 1 commit
  7. 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
  8. 03 May, 2016 1 commit
  9. 21 Apr, 2016 2 commits
  10. 23 Feb, 2016 1 commit
  11. 15 Feb, 2016 1 commit
  12. 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
  13. 12 Jul, 2015 1 commit
  14. 09 Jun, 2015 1 commit
  15. 20 Apr, 2015 5 commits
  16. 03 Mar, 2015 3 commits
  17. 27 Feb, 2015 1 commit
  18. 14 Feb, 2015 2 commits
  19. 13 Feb, 2015 3 commits
  20. 12 Feb, 2015 1 commit
  21. 30 Dec, 2014 1 commit
  22. 29 Dec, 2014 1 commit
  23. 06 Dec, 2014 1 commit
  24. 27 Oct, 2014 5 commits