- 11 Feb, 2016 2 commits
-
-
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 -
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 Jul, 2015 1 commit
-
-
The header src/cc-compat.h defines portable format specifiers PRIuZ, PRIdZ, and PRIxZ. The original report highlighted the need to use these specifiers in examples/network/fetch.c. For this commit, I checked all C source and header files not in deps/ and transitioned to the appropriate format specifier where appropriate.
Matthew Plough committed
-
- 09 Jun, 2015 1 commit
-
-
Coverity complains about the git_rawobj ones because we use a loop in which we keep remembering the old version, and we end up copying our object as the base, so we want to have the data pointer be NULL.
Carlos Martín Nieto committed
-
- 20 Apr, 2015 5 commits
-
-
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
-
In `git_rebase_operation_current()`, indicate when a rebase has not started (with `GIT_REBASE_NO_OPERATION`) rather than conflating that with the first operation being in-progress.
Edward Thomson committed
-
- 03 Mar, 2015 3 commits
-
-
Carlos Martín Nieto committed
-
This function is meant to simulate what git does in the reset command, so we should include the reflog message in that.
Carlos Martín Nieto committed -
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
-
- 27 Feb, 2015 1 commit
-
-
Edward Thomson committed
-
- 14 Feb, 2015 2 commits
-
-
Provide git_indexwriter_init_for_operation for the common locking pattern in merge, rebase, revert and cherry-pick.
Edward Thomson committed -
Edward Thomson committed
-
- 13 Feb, 2015 3 commits
-
-
Switch to a standard branch-switching pattern of a `SAFE` checkout, then updating `HEAD`.
Edward Thomson committed -
Don't require the branch to rebase, if given `NULL`, simply look up `HEAD`.
Edward Thomson committed -
Users may want to try to pay attention to the `exec` field on all rebase operations.
Edward Thomson committed
-
- 12 Feb, 2015 1 commit
-
-
Jameson Miller committed
-
- 30 Dec, 2014 1 commit
-
-
Jacques Germishuys committed
-
- 29 Dec, 2014 1 commit
-
-
Jacques Germishuys 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 17 commits
-
-
Edward Thomson committed
-
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
-
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 -
Abort an in-progress rebase and move the working directory and repository back to the ORIG_HEAD state.
Edward Thomson committed -
Introduce `git_rebase` to set up a rebase session that can then be continued. Immediately, only merge-type rebase is supported.
Edward Thomson committed
-