summaryrefslogtreecommitdiff
path: root/Documentation/merge-strategies.txt
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2012-10-29 04:15:04 -0400
committerLibravatar Jeff King <peff@peff.net>2012-10-29 04:15:04 -0400
commit9c50374497d5a3259907e32455f228cfbda85ddf (patch)
tree544254f56258544ec15aaa24c86924a24d97efb9 /Documentation/merge-strategies.txt
parentMerge branch 'nd/status-long' (diff)
parentbranch: show targets of deleted symrefs, not sha1s (diff)
downloadtgif-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 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions