diff options
| author |  Jonathan Nieder <jrnieder@gmail.com> | 2010-04-15 02:25:38 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-04-15 00:53:40 -0700 |
| commit | fff0d0abdde6729606824688c2acac72db643e65 (patch) | |
| tree | c80ee5861344d243cae98b8ac6166ee3994cf60c /t/t1006-cat-file.sh | |
| parent | Documentation/config.txt: default gc.aggressiveWindow is 250, not 10 (diff) | |
| download | tgif-fff0d0abdde6729606824688c2acac72db643e65.tar.xz | |
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>
Diffstat (limited to 't/t1006-cat-file.sh')
0 files changed, 0 insertions, 0 deletions