- 11 Feb, 2016 1 commit
-
-
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
-
- 30 Apr, 2015 1 commit
-
-
Tomas Paladin Volf committed
-
- 20 Apr, 2015 6 commits
-
-
Edward Thomson committed
-
Edward Thomson committed
-
`git_rebase_init` and `git_rebase_open` should take a `git_rebase_options` and use it for future rebase operations on that `rebase` object.
Edward Thomson committed -
Edward Thomson committed
-
Edward Thomson committed
-
git_rebase_commit should return `GIT_EUNMERGED` when unmerged items exist in the index, per the documentation. Test that this is correct.
Edward Thomson committed
-
- 03 Mar, 2015 1 commit
-
-
The signature for the reflog is not something which changes dynamically. Almost all uses will be NULL, since we want for the repository's default identity to be used, making it noise. In order to allow for changing the identity, we instead provide git_repository_set_ident() and git_repository_ident() which allow a user to override the choice of signature.
Carlos Martín Nieto committed
-
- 07 Dec, 2014 1 commit
-
-
Linquize committed
-
- 06 Dec, 2014 1 commit
-
-
Make it consistent between git_note_create() and git_note_remote() by putting it after the repository.
Carlos Martín Nieto committed
-
- 27 Oct, 2014 12 commits
-
-
Rename git_merge_head to git_annotated_commit, as it becomes used in more operations than just merge.
Edward Thomson committed -
Edward Thomson committed
-
Edward Thomson committed
-
Edward Thomson committed
-
Edward Thomson committed
-
Edward Thomson committed
-
Edward Thomson committed
-
Edward Thomson committed
-
Already cherry-picked commits should not be re-included. If all changes included in a commit exist in the upstream, then we should error with GIT_EAPPLIED.
Edward Thomson committed -
Commit the current patch of a rebase process.
Edward Thomson committed -
Edward Thomson committed
-
`git_rebase_next` will apply the next patch (or cherry-pick) operation, leaving the results checked out in the index / working directory so that consumers can resolve any conflicts, as appropriate.
Edward Thomson committed
-