]> git.proxmox.com Git - libgit2.git/commitdiff
Merge pull request #1450 from carlosmn/branch-upstream
authorVicent Martí <vicent@github.com>
Thu, 11 Apr 2013 13:34:59 +0000 (06:34 -0700)
committerVicent Martí <vicent@github.com>
Thu, 11 Apr 2013 13:34:59 +0000 (06:34 -0700)
Branch upstream configuration

1  2 
include/git2/branch.h
src/revparse.c

Simple merge
diff --cc src/revparse.c
Simple merge