summaryrefslogtreecommitdiff
path: root/test-scrap-cache-tree.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-12-28 13:58:57 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-12-28 13:58:58 -0800
commitaecb9979df1403923d66e7fc70b0374f1765b679 (patch)
tree5ee634beb4b95fba3ce7d45b4259898d6d908464 /test-scrap-cache-tree.c
parentMerge branch 'jk/pending-keep-tag-name' (diff)
parentgit-p4: reduce number of server queries for fetches (diff)
downloadtgif-aecb9979df1403923d66e7fc70b0374f1765b679.tar.xz
Merge branch 'sh/p4-multi-depot'
"git p4" when interacting with multiple depots at the same time used to incorrectly drop changes. * sh/p4-multi-depot: git-p4: reduce number of server queries for fetches git-p4: support multiple depot paths in p4 submit git-p4: failing test case for skipping changes with multiple depots
Diffstat (limited to 'test-scrap-cache-tree.c')
0 files changed, 0 insertions, 0 deletions