]> git.proxmox.com Git - libgit2.git/commit - tests/reset/soft.c
reset changes for merge
authorEdward Thomson <ethomson@edwardthomson.com>
Tue, 23 Oct 2012 20:42:09 +0000 (15:42 -0500)
committerEdward Thomson <ethomson@edwardthomson.com>
Thu, 25 Oct 2012 01:24:37 +0000 (20:24 -0500)
commit632d8b230bf38cc61cd70b55a54ae2f52502b4af
tree38a8c4825ab59511951b586edb434a5240f3dc9f
parent6f6b0c013c6eff2aca2a7ada1027044f2e20f578
reset changes for merge
include/git2/repository.h
src/merge.c [new file with mode: 0644]
src/merge.h [new file with mode: 0644]
src/refs.h
src/repository.c
src/reset.c
tests-clar/repo/state.c [new file with mode: 0644]
tests-clar/reset/hard.c
tests-clar/reset/soft.c