Age | Commit message (Collapse) | Author |
|
|
|
Created through the following
$ git init assume_unchanged_wd && cd assume_unchanged_wd
$ echo "hello" > hello.txt
$ echo "world" > world.txt
$ git add .
$ git commit -m "Initial commit"
$ echo "Hello" > hello.txt
$ echo "World" > world.txt
$ git status
On branch master
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
modified: hello.txt
modified: world.txt
no changes added to commit (use "git add" and/or "git commit -a")
$ git update-index --assume-unchanged world.txt
$ git status
On branch master
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
modified: hello.txt
no changes added to commit (use "git add" and/or "git commit -a")
|
|
Not all tags have a tagger. For example, the v2.6.11 tag on the linux repository does not have a tagger. For these cases, return null for the Tagger property on a tag annotation.
|
|
|
|
|
|
|
|
Checkout methods now use CheckoutOptions
Merge now takes several options:
- Option to specify what is checked out for file conflicts.
- Report CheckoutProgress and CheckoutNotify
- Option to specify MergeFileFavor
Updates for code review feedback
|
|
merging branches.
This includes a refactoring of the merge logic to support the new
scenarios. New functionality includes:
- Deprecate Network.Fetchheads, Repository.MergeHeads as these should be
internal only.
- Introduce ability to pull the configured upstream branch for the current
branch
- Introduce ability to merge a branch into the current branch.
- Introduce options to control merge behavior. The current exposed options
include whether to commit the merge commit and the allowed merge types.
|
|
By default, we now throw an exception when trying to commit an
"empty commit" - that is, one that does not change any items.
This check only applies when doing a normal commit, or an amend
of a normal commit; it does not apply when performing a merge or
an amend of a merge commit. This check can optionally be overridden.
|
|
|
|
Fix #484
|
|
|
|
* ContextLines
* InterhunkLines
Closes #423
|
|
|
|
|
|
|
|
Fix git-tfs/git-tfs#300
|
|
|
|
Fix #302
|
|
|
|
|
|
|
|
|
|
|
|
Entries are supposed to be separated by Unix line endings, not Windows ones
|
|
ordering issue when determining status
|
|
|
|
|
|
|
|
- Doesn't handle line endings conversion
- Doesn't honor .gitignore
- Test repositories have been moved under LibGit2Sharp.Tests
- .gitattributes file has been added to prevent unexpected line endings conversion of the test repositories files
Should fix issue #49.
|