- 25 Nov, 2015 1 commit
-
-
Edward Thomson committed
-
- 07 Jul, 2015 1 commit
-
-
Edward Thomson committed
-
- 16 Mar, 2015 1 commit
-
-
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
-
- 27 Oct, 2014 1 commit
-
-
Edward Thomson committed
-
- 03 Aug, 2014 1 commit
-
-
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth committed
-
- 14 Apr, 2014 1 commit
-
-
Jacques Germishuys committed
-
- 20 Mar, 2014 1 commit
-
-
Edward Thomson committed
-
- 06 Mar, 2014 1 commit
-
-
Ben Straub committed
-
- 05 Feb, 2014 1 commit
-
-
Ben Straub committed
-
- 03 Feb, 2014 1 commit
-
-
Ben Straub committed
-
- 20 Jan, 2014 2 commits
-
-
The "merge none" (don't automerge) flag was only to aide in merge trivial tests. We can easily determine whether merge trivial resulted in a trivial merge or an automerge by examining the REUC after automerge has completed.
Edward Thomson committed -
The default merge_file level was XDL_MERGE_MINIMAL, which will produce conflicts where there should not be in the case where both sides were changed identically. Change the defaults to be more aggressive (XDL_MERGE_ZEALOUS) which will more aggressively compress non-conflicts. This matches git.git's defaults. Increase testing around reverting a previously reverted commit to illustrate this problem.
Edward Thomson committed
-
- 03 Dec, 2013 2 commits
-
-
Oh, MSVC.
Edward Thomson committed -
Edward Thomson committed
-
- 02 Dec, 2013 1 commit
-
-
Edward Thomson committed
-