Edward Thomson
5ae38538c6
rebase: take checkout_options where appropriate
2015-04-20 16:22:49 -04:00
Edward Thomson
eaf0d68830
rebase: block rebase_commit with unstaged changes
2015-04-20 16:22:39 -04:00
Edward Thomson
49b3ddf216
rebase: commit should return GIT_EUNMERGED
...
git_rebase_commit should return `GIT_EUNMERGED` when unmerged items
exist in the index, per the documentation. Test that this is correct.
2015-04-20 16:22:31 -04:00
Carlos Martín Nieto
659cf2029f
Remove the signature from ref-modifying functions
...
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.
2015-03-03 14:40:50 +01:00
Linquize
8e0aa2ebce
Fix broken merge tests due to autocrlf was not false
2014-12-07 23:41:30 +08:00
Carlos Martín Nieto
21083a7129
notes: move the notes name argument
...
Make it consistent between git_note_create() and git_note_remote() by
putting it after the repository.
2014-12-06 04:20:09 +01:00
Edward Thomson
18b00406c6
s/git_merge_head/git_annotated_commit
...
Rename git_merge_head to git_annotated_commit, as it becomes used
in more operations than just merge.
2014-10-26 22:59:48 -04:00
Edward Thomson
f152f8ac0c
rebase: preload all operations
2014-10-26 22:59:38 -04:00
Edward Thomson
b6b636a7fa
rebase: init/open a git_rebase object
2014-10-26 22:59:36 -04:00
Edward Thomson
18b439b9be
git_rebase_next: provide info about the operation
2014-10-26 22:59:34 -04:00
Edward Thomson
5ae9d296e3
git_rebase_finish: rewrite notes when finishing rebase
2014-10-26 22:59:32 -04:00
Edward Thomson
a612a25fa6
git_rebase_commit: write HEAD's reflog appropriately
2014-10-26 22:59:27 -04:00
Edward Thomson
517644cce4
Introduce git_rebase_finish to complete a rebase
2014-10-26 22:59:25 -04:00
Edward Thomson
14864fbfeb
git_rebase_next: test that we return GIT_ITEROVER
2014-10-26 22:59:23 -04:00
Edward Thomson
93a7004cc2
git_rebase_commit: drop already-picked commits
...
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.
2014-10-26 22:59:21 -04:00
Edward Thomson
a35a9890b0
Introduce git_rebase_commit
...
Commit the current patch of a rebase process.
2014-10-26 22:59:19 -04:00
Edward Thomson
443d5674fe
git_rebase_next: write conflicts nicely during rebase
2014-10-26 22:59:16 -04:00
Edward Thomson
950a709159
Introduce git_rebase_next
...
`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.
2014-10-26 22:59:14 -04:00
