| commit | c2cd3585217765a69fc67f1e6ed59ab4f36791e4 | |
| author | Jeff King <peff@peff.net> | |
| Thu, 25 Oct 2012 11:16:04 +0000 (25 07:16 -0400) | ||
| committer | Jeff King <peff@peff.net> | |
| Thu, 25 Oct 2012 11:16:04 +0000 (25 07:16 -0400) | ||
| tree | d32dfd5806d8ce6eee8fbbc050f7a81a5fb25986 | treesnapshot (tar.gz zip) |
| parent | ff1b3a0a9bd3bc939904801f54544abe1a945609 | commitdiff |
| parent | 13baa9fe866f63311af5a5ee318beddb16eb5df4 | commitdiff |
Merge branch 'rs/branch-del-symref' into next
A symbolic ref refs/heads/SYM was not correctly removed with
"git branch -d SYM"; the command removed the ref pointed by
SYM instead.
Will merge to 'master' in the second batch after 1.8.0 ships.
* 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()
A symbolic ref refs/heads/SYM was not correctly removed with
"git branch -d SYM"; the command removed the ref pointed by
SYM instead.
Will merge to 'master' in the second batch after 1.8.0 ships.
* 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()