summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-07-08 13:56:53 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-07-08 14:34:24 -0700
commit47a59185369b8905ad3a4012688cba92fd2ac1ff (patch)
tree7e271a236273885e4188eb7e1910ba932bd2a1eb /Documentation/git-merge.txt
parentMerge branch 'maint' (diff)
downloadtgif-47a59185369b8905ad3a4012688cba92fd2ac1ff.tar.xz
cache.h: move remote/connect API out of it
The definition of "struct ref" in "cache.h", a header file so central to the system, always confused me. This structure is not about the local ref used by sha1-name API to name local objects. It is what refspecs are expanded into, after finding out what refs the other side has, to define what refs are updated after object transfer succeeds to what values. It belongs to "remote.h" together with "struct refspec". While we are at it, also move the types and functions related to the Git transport connection to a new header file connect.h Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions