summaryrefslogtreecommitdiff
path: root/compat/regex/regex.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-12-30 06:43:04 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-12-30 09:24:56 (GMT)
commit99c419c91554e9f60940228006b7d39d42704da7 (patch)
tree4ce2131767fb35c2f6b9359ce8e44fd5969f7533 /compat/regex/regex.c
parentc2ff10c98e22ae64d553273e6d67bb123a1c916f (diff)
downloadgit-99c419c91554e9f60940228006b7d39d42704da7.zip
git-99c419c91554e9f60940228006b7d39d42704da7.tar.gz
git-99c419c91554e9f60940228006b7d39d42704da7.tar.bz2
branch -d: base the "already-merged" safety on the branch it merges with
When a branch is marked to merge with another ref (e.g. local 'next' that merges from and pushes back to origin's 'next', with 'branch.next.merge' set to 'refs/heads/next'), it makes little sense to base the "branch -d" safety, whose purpose is not to lose commits that are not merged to other branches, on the current branch. It is much more sensible to check if it is merged with the other branch it merges with. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'compat/regex/regex.c')
0 files changed, 0 insertions, 0 deletions