summaryrefslogtreecommitdiff
path: root/builtin/merge-index.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-04-27 11:36:41 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-04-27 11:36:41 -0700
commit6213ccaac90e2eed50739daf9097c054c8317215 (patch)
treed05dcc3b9cd7e0be7ee3f294fd5f29f764052e93 /builtin/merge-index.c
parentMerge branch 'jc/pack-objects-bigfile' (diff)
parentstash: drop dirty worktree check on apply (diff)
downloadtgif-6213ccaac90e2eed50739daf9097c054c8317215.tar.xz
Merge branch 'jk/stash-loosen-safety'
* jk/stash-loosen-safety: stash: drop dirty worktree check on apply
Diffstat (limited to 'builtin/merge-index.c')
0 files changed, 0 insertions, 0 deletions