summaryrefslogtreecommitdiff
path: root/t/t5515/refs.br-branches-default-merge_branches-default
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-12-03 00:38:12 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-12-03 00:38:12 -0800
commitae26e7c74970281bd3597c79e44a8b54a927bbe1 (patch)
treeab91c9e9de975fd469f81795a5f53026050b2b71 /t/t5515/refs.br-branches-default-merge_branches-default
parentMerge branch 'maint' (diff)
parentgit add --intent-to-add: do not let an empty blob be committed by accident (diff)
downloadtgif-ae26e7c74970281bd3597c79e44a8b54a927bbe1.tar.xz
Merge branch 'jc/rm-i-t-a'
* jc/rm-i-t-a: git add --intent-to-add: do not let an empty blob be committed by accident git add --intent-to-add: fix removal of cached emptiness builtin-rm.c: explain and clarify the "local change" logic Extend index to save more flags
Diffstat (limited to 't/t5515/refs.br-branches-default-merge_branches-default')
0 files changed, 0 insertions, 0 deletions