delta/libgit2.git - github.com: libgit2/libgit2.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	rebase: correctly finish rebasing detached headsethomson/rebase_detached	Edward Thomson	2016-04-21	1	-0/+50
\| \| \| \| \|	When rebasing with IDs, we do not return to the `branch`, we remain in a detached HEAD state.
*	rebase: additional tests for completing a rebase	Edward Thomson	2016-02-28	1	-0/+57
\|
*	rebase: allow custom merge_options	Edward Thomson	2016-02-11	1	-0/+30
\| \| \| \| \| \|	Allow callers of rebase to specify custom merge options. This may allow custom conflict resolution, or failing fast when conflicts are detected.
*	Fixed unused warning in tests/rebase/merge.c	Tomas Paladin Volf	2015-04-30	1	-0/+5
\|
*	rebase: include checkout opts within rebase opts	Edward Thomson	2015-04-20	1	-1/+2
\|
*	rebase: test checkout options for rebase	Edward Thomson	2015-04-20	1	-0/+49
\|
*	rebase: init and open take a rebase_options	Edward Thomson	2015-04-20	1	-50/+26
\| \| \| \| \| \|	`git_rebase_init` and `git_rebase_open` should take a `git_rebase_options` and use it for future rebase operations on that `rebase` object.
*	rebase: take `checkout_options` where appropriate	Edward Thomson	2015-04-20	1	-8/+8
\|
*	rebase: block rebase_commit with unstaged changes	Edward Thomson	2015-04-20	1	-0/+35
\|
*	rebase: commit should return GIT_EUNMERGED	Edward Thomson	2015-04-20	1	-1/+3
\| \| \| \| \|	git_rebase_commit should return `GIT_EUNMERGED` when unmerged items exist in the index, per the documentation. Test that this is correct.
*	Remove the signature from ref-modifying functions	Carlos Martín Nieto	2015-03-03	1	-8/+8
\| \| \| \| \| \| \| \| \| \|	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.
*	Fix broken merge tests due to autocrlf was not false	Linquize	2014-12-07	1	-0/+12
\|
*	notes: move the notes name argument	Carlos Martín Nieto	2014-12-06	1	-2/+2
\| \| \| \| \|	Make it consistent between git_note_create() and git_note_remote() by putting it after the repository.
*	s/git_merge_head/git_annotated_commit	Edward Thomson	2014-10-26	1	-41/+41
\| \| \| \| \|	Rename git_merge_head to git_annotated_commit, as it becomes used in more operations than just merge.
*	rebase: preload all operations	Edward Thomson	2014-10-26	1	-12/+12
\|
*	rebase: init/open a git_rebase object	Edward Thomson	2014-10-26	1	-38/+54
\|
*	git_rebase_next: provide info about the operation	Edward Thomson	2014-10-26	1	-17/+34
\|
*	git_rebase_finish: rewrite notes when finishing rebase	Edward Thomson	2014-10-26	1	-1/+93
\|
*	git_rebase_commit: write HEAD's reflog appropriately	Edward Thomson	2014-10-26	1	-1/+9
\|
*	Introduce git_rebase_finish to complete a rebase	Edward Thomson	2014-10-26	1	-0/+57
\|
*	git_rebase_next: test that we return GIT_ITEROVER	Edward Thomson	2014-10-26	1	-0/+50
\|
*	git_rebase_commit: drop already-picked commits	Edward Thomson	2014-10-26	1	-0/+38
\| \| \| \| \| \|	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.
*	Introduce git_rebase_commit	Edward Thomson	2014-10-26	1	-0/+91
\| \| \| \|	Commit the current patch of a rebase process.
*	git_rebase_next: write conflicts nicely during rebase	Edward Thomson	2014-10-26	1	-0/+59
\|
*	Introduce git_rebase_next	Edward Thomson	2014-10-26	1	-0/+59
	`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.