{"thread":{"id":"23469","subject":"[PATCH] Document new \"already-merged\" rule for branch -d","startedAt":"2010-04-15T07:25:38Z","lastAt":"2010-04-15T07:25:38Z","messageCount":1,"participants":["Jonathan Nieder"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"139559","messageId":"20100415072438.GA13394@progeny.tock","threadId":"23469","inReplyTo":null,"subject":"[PATCH] Document new \"already-merged\" rule for branch -d","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-04-15T07:25:38Z","receivedAt":"2010-04-15T07:25:38Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"v1.7.0-rc0~18^2 (branch -d: base the \"already-merged\" safety on the\nbranch it merges with, 2009-12-29) taught ‘git branch’ a new heuristic\nfor when it is safe to delete a branch without forcing the issue.  It\nis safe to delete a branch \"topic\" without second thought if:\n\n - the branch \"topic\" is set up to pull from a (remote-tracking,\n   usually) branch and is fully merged in that \"upstream\" branch, or\n\n - there is no branch.topic.merge configuration and branch \"topic\" is\n   fully merged in the current HEAD.\n\nUpdate the man page to acknowledge the new rules.\n\nSigned-off-by: Jonathan Nieder <jrnieder@gmail.com>\n---\nI was looking in the documentation for a way to disable the new\nbehavior.  But that was the wrong idea --- better to see what it’s\nlike to get used to it first.\n\n Documentation/git-branch.txt |    4 +++-\n 1 files changed, 3 insertions(+), 1 deletions(-)\n\ndiff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt\nindex d78f4c7..1940256 100644\n--- a/Documentation/git-branch.txt\n+++ b/Documentation/git-branch.txt\n@@ -63,7 +63,9 @@ way to clean up all obsolete remote-tracking branches.\n OPTIONS\n -------\n -d::\n-\tDelete a branch. The branch must be fully merged in HEAD.\n+\tDelete a branch. The branch must be fully merged in its\n+\tupstream branch, or in `HEAD` if no upstream was set with\n+\t`--track` or `--set-upstream`.\n \n -D::\n \tDelete a branch irrespective of its merged status.\n-- \n1.7.1.rc1\n"}]}