- 16 Jun, 2015 1 commit
-
-
Edward Thomson committed
-
- 28 May, 2015 1 commit
-
-
It's not always obvious the mapping between stage level and conflict-ness. More importantly, this can lead otherwise sane people to write constructs like `if (!git_index_entry_stage(entry))`, which (while technically correct) is unreadable. Provide a nice method to help avoid such messy thinking.
Edward Thomson committed
-
- 11 May, 2015 1 commit
-
-
Edward Thomson committed
-
- 16 Mar, 2015 3 commits
-
-
Jacques Germishuys committed
-
Jacques Germishuys committed
-
Jacques Germishuys committed
-
- 03 Mar, 2015 2 commits
-
-
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
-
- 14 Feb, 2015 1 commit
-
-
Always lock the index when we begin the merge, before we write any of the metdata files. This prevents a race where another client may run a commit after we have written the MERGE_HEAD but before we have updated the index, which will produce a merge commit that is treesame to one parent. The merge will finish and update the index and the resultant commit would not be a merge at all.
Edward Thomson committed
-
- 13 Feb, 2015 1 commit
-
-
Correct the merge failed cleanup test. Merge data should not be cleaned up on conflicts, only on actual failure. And ORIG_HEAD should not be removed at all.
Edward Thomson committed
-
- 07 Dec, 2014 1 commit
-
-
Linquize committed
-
- 27 Oct, 2014 1 commit
-
-
Rename git_merge_head to git_annotated_commit, as it becomes used in more operations than just merge.
Edward Thomson committed
-
- 01 Oct, 2014 1 commit
-
-
Vicent Marti committed
-
- 26 Sep, 2014 1 commit
-
-
Jakub Čajka committed
-
- 16 Sep, 2014 1 commit
-
-
Ciro Santilli committed
-
- 03 Aug, 2014 1 commit
-
-
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth committed
-
- 01 Jul, 2014 2 commits
-
-
git_checkout_index can now check out other git_index's (that are not necessarily the repository index). This allows checkout_index to use the repository's index for stat cache information instead of the index data being checked out. git_merge and friends now check out their indexes directly instead of trying to blend it into the running index.
Edward Thomson committed -
Edward Thomson committed
-
- 28 May, 2014 3 commits
-
-
Edward Thomson committed
-
Edward Thomson committed
-
git_merge_analysis will now return GIT_MERGE_CONFIG_NO_FASTFORWARD when merge.ff=false and GIT_MERGE_CONFIG_FASTFORWARD_ONLY when merge.ff=true
Edward Thomson committed
-
- 23 Apr, 2014 2 commits
-
-
Edward Thomson committed
-
Edward Thomson committed
-
- 14 Apr, 2014 1 commit
-
-
Jacques Germishuys committed
-
- 31 Mar, 2014 1 commit
-
-
Edward Thomson committed
-
- 20 Mar, 2014 9 commits
-
-
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
-
- 06 Mar, 2014 1 commit
-
-
Ben Straub committed
-
- 05 Feb, 2014 2 commits
-
-
Ben Straub committed
-
Ben Straub committed
-
- 04 Feb, 2014 3 commits
-
-
Edward Thomson committed
-
Edward Thomson committed
-
Edward Thomson committed
-