| commit | fff0d0abdde6729606824688c2acac72db643e65 | |
| author | Jonathan Nieder <jrnieder@gmail.com> | |
| Thu, 15 Apr 2010 07:25:38 +0000 (15 02:25 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 15 Apr 2010 07:53:40 +0000 (15 00:53 -0700) | ||
| tree | c80ee5861344d243cae98b8ac6166ee3994cf60c | treesnapshot (tar.gz zip) |
| parent | f78683f3a85ca16ae16e1180703d3280b272f45d | commitdiff |
Document new "already-merged" rule for branch -d
v1.7.0-rc0~18^2 (branch -d: base the "already-merged" safety on the
branch it merges with, 2009-12-29) taught ‘git branch’ a new heuristic
for when it is safe to delete a branch without forcing the issue. It
is safe to delete a branch "topic" without second thought if:
- the branch "topic" is set up to pull from a (remote-tracking,
usually) branch and is fully merged in that "upstream" branch, or
- there is no branch.topic.merge configuration and branch "topic" is
fully merged in the current HEAD.
Update the man page to acknowledge the new rules.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
v1.7.0-rc0~18^2 (branch -d: base the "already-merged" safety on the
branch it merges with, 2009-12-29) taught ‘git branch’ a new heuristic
for when it is safe to delete a branch without forcing the issue. It
is safe to delete a branch "topic" without second thought if:
- the branch "topic" is set up to pull from a (remote-tracking,
usually) branch and is fully merged in that "upstream" branch, or
- there is no branch.topic.merge configuration and branch "topic" is
fully merged in the current HEAD.
Update the man page to acknowledge the new rules.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/git-branch.txt | diffblobblamehistory |