diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-12-29 22:43:04 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-30 01:24:56 -0800 |
| commit | 99c419c91554e9f60940228006b7d39d42704da7 (patch) | |
| tree | 4ce2131767fb35c2f6b9359ce8e44fd5969f7533 /check-builtins.sh | |
| parent | Merge branch 'jk/1.7.0-status' (diff) | |
| download | tgif-99c419c91554e9f60940228006b7d39d42704da7.tar.xz | |
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 'check-builtins.sh')
0 files changed, 0 insertions, 0 deletions