- 27 Oct, 2014 3 commits
-
-
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 -
Introduce `git_rebase` to set up a rebase session that can then be continued. Immediately, only merge-type rebase is supported.
Edward Thomson committed
-
- 26 Oct, 2014 1 commit
-
-
Linquize committed
-
- 13 Oct, 2014 1 commit
-
-
Edward Thomson committed
-
- 09 Oct, 2014 2 commits
-
-
Arthur Schreiber committed
-
Arthur Schreiber committed
-
- 04 Oct, 2014 1 commit
-
-
Linquize committed
-
- 18 Aug, 2014 2 commits
-
-
This reverts commit 0dc54e14.
Vicent Marti committed -
We don't really use this at all, and it breaks packaging in Windows.
Vicent Marti committed
-
- 30 Apr, 2014 1 commit
-
-
Built with the following script: #!/bin/sh test_tick () { sleep 10 } test_tick && echo one >file && git add file && git commit -m initial && one=$(git rev-parse HEAD) && git describe --always HEAD && test_tick && echo two >file && git add file && git commit -m second && two=$(git rev-parse HEAD) && test_tick && echo three >file && git add file && git commit -m third && test_tick && echo A >file && git add file && git commit -m A && test_tick && git tag -a -m A A && test_tick && echo c >file && git add file && git commit -m c && test_tick && git tag c && git reset --hard $two && test_tick && echo B >side && git add side && git commit -m B && test_tick && git tag -a -m B B && test_tick && git merge -m Merged c && merged=$(git rev-parse HEAD) && git reset --hard $two && test_tick && echo D >another && git add another && git commit -m D && test_tick && git tag -a -m D D && test_tick && git tag -a -m R R && test_tick && echo DD >another && git commit -a -m another && test_tick && git tag e && test_tick && echo DDD >another && git commit -a -m "yet another" && test_tick && git merge -m Merged $merged && test_tick && echo X >file && echo X >side && git add file side && git commit -m x
nulltoken committed
-
- 15 Apr, 2014 1 commit
-
-
Jacques Germishuys committed
-
- 14 Apr, 2014 1 commit
-
-
Jacques Germishuys committed
-
- 20 Mar, 2014 1 commit
-
-
Edward Thomson committed
-
- 10 Mar, 2014 1 commit
-
-
Jiri Pospisil committed
-
- 27 Jan, 2014 2 commits
-
-
Russell Belfer committed
-
Writing a sample Javascript driver pointed out some extra whitespace handling that needed to be done in the diff driver. This adds some tests with some sample javascript code that I pulled off of GitHub just to see what would happen. Also, to clean up the userdiff test data, I did a "git gc" and packed up the test objects.
Russell Belfer committed
-
- 24 Jan, 2014 1 commit
-
-
This moves the expected and actual test data along with the source data for the userdiff tests into the tests/resources/userdiff test repo and updates the test to use that.
Russell Belfer committed
-
- 22 Jan, 2014 1 commit
-
-
Don't try to determine whether the system supports file modes when putting the tree data in the index during checkout. The tree's mode is canonical and did not come from stat(2) in the first place.
Edward Thomson committed
-
- 20 Jan, 2014 3 commits
-
-
Edward Thomson committed
-
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
-
- 08 Jan, 2014 1 commit
-
-
Edward Thomson committed
-
- 02 Dec, 2013 1 commit
-
-
Edward Thomson committed
-
- 19 Nov, 2013 1 commit
-
-
nulltoken committed
-
- 14 Nov, 2013 1 commit
-
-
Ben Straub committed
-
- 11 May, 2012 6 commits
-
-
Ben Straub committed
-
Ben Straub committed
-
Ported date.c (for approxidate_careful) from git.git revision aa39b85. Trimmed out the parts we're not using.
Ben Straub committed -
Added tracking configuration to the test repo's config to support unit tests.
Ben Straub committed -
Added some reflags to the test repo to support unit tests.
Ben Straub committed -
Ben Straub committed
-
- 02 May, 2012 2 commits
-
-
Vicent Martí committed
-
Vicent Martí committed
-
- 25 Apr, 2012 1 commit
-
-
Carlos Martín Nieto committed
-
- 16 Apr, 2012 1 commit
-
-
Variable values may be quoted to include newlines, literal quotes and other characters. Add support for these and test it.
Carlos Martín Nieto committed
-
- 10 Apr, 2012 1 commit
-
-
nulltoken committed
-
- 31 Mar, 2012 1 commit
-
-
Removed the BUILD_CLAR CMake flag, and updated the readme.
Ben Straub committed
-
- 30 Mar, 2012 1 commit
-
-
Also cleaned up some names for things that used to be macros.
Ben Straub committed
-
- 26 Mar, 2012 1 commit
-
-
Russell Belfer committed
-