git.proxmox.com Git - libgit2.git/commit - tests/refs/branches/move.c

]> git.proxmox.com Git - libgit2.git/commit - tests/refs/branches/move.c

projects / libgit2.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 54c02d2 90befde)

author	Alan Rogers <alan@github.com>
	Wed, 4 Jun 2014 22:36:28 +0000 (15:36 -0700)
committer	Alan Rogers <alan@github.com>
	Wed, 4 Jun 2014 22:36:28 +0000 (15:36 -0700)
commit	dc49e1b5b368b4b7d5b8ae8a0a12027f86395cad
tree	6335b980e9ff7688d758e411088838b6adb75baa	tree
parent	54c02d212d70b439f402c74c6b1f6c835daa43fc	commit \| diff
parent	90befde4a1938641dfdb9a7bdb9f361d1de5c26f	commit \| diff

Merge remote-tracking branch 'origin/development' into fix-git-status-list-new-unreadable-folder

Conflicts:
include/git2/diff.h

include/git2/diff.h	diff1 \|	diff2 \|	blob \| history
include/git2/types.h	diff1 \|	diff2 \|	blob \| history
src/diff.c	diff1 \|	diff2 \|	blob \| history
src/diff_print.c	diff1 \|	diff2 \|	blob \| history
src/path.c	diff1 \|	diff2 \|	blob \| history

The git library used in some Proxmox tool chains