]> git.proxmox.com Git - libgit2.git/commitdiff
projects / libgit2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 702c3bf bdb2f24)
Merge pull request #1174 from nulltoken/topic/soft_reset_with_index_conflicts
authorVicent Martí <vicent@github.com>
Fri, 4 Jan 2013 19:10:39 +0000 (11:10 -0800)
committerVicent Martí <vicent@github.com>
Fri, 4 Jan 2013 19:10:39 +0000 (11:10 -0800)
Prevent soft reset when index contains conflicts


Trivial merge
The git library used in some Proxmox tool chains