summaryrefslogtreecommitdiff
path: root/Documentation/git-pull.txt
diff options
context:
space:
mode:
authorLibravatar Stefan Beller <sbeller@google.com>2018-07-16 16:05:38 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-07-17 11:25:31 -0700
commitee1df66f7cfd0f37bb0e235c4f7ef12bd09a8d2d (patch)
tree39f938cd7833e6a74505e80da0b9184b325d12dc /Documentation/git-pull.txt
parentdiff.c: do not pass diff options as keydata to hashmap (diff)
downloadtgif-ee1df66f7cfd0f37bb0e235c4f7ef12bd09a8d2d.tar.xz
diff.c: adjust hash function signature to match hashmap expectation
This makes the follow up patch easier. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-pull.txt')
0 files changed, 0 insertions, 0 deletions