diff options
| author |  Jeff King <peff@peff.net> | 2012-10-29 04:15:04 -0400 |
|---|---|---|
| committer | Jeff King <peff@peff.net> | 2012-10-29 04:15:04 -0400 |
| commit | 9c50374497d5a3259907e32455f228cfbda85ddf (patch) | |
| tree | 544254f56258544ec15aaa24c86924a24d97efb9 /mergetools/p4merge | |
| parent | Merge branch 'nd/status-long' (diff) | |
| parent | branch: show targets of deleted symrefs, not sha1s (diff) | |
| download | tgif-9c50374497d5a3259907e32455f228cfbda85ddf.tar.xz | |
Merge branch 'rs/branch-del-symref'
A symbolic ref refs/heads/SYM was not correctly removed with
"git branch -d SYM"; the command removed the ref pointed by
SYM instead.
* rs/branch-del-symref:
branch: show targets of deleted symrefs, not sha1s
branch: skip commit checks when deleting symref branches
branch: delete symref branch, not its target
branch: factor out delete_branch_config()
branch: factor out check_branch_commit()
Diffstat (limited to 'mergetools/p4merge')
0 files changed, 0 insertions, 0 deletions