diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-05-15 01:31:15 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-05-15 01:31:15 -0700 |
commit | 1fbb58b4153e90eda08c2b022ee32d90729582e6 (patch) | |
tree | ab3b850ab1c4f7d46be319133193d7fd7c0d6cb2 /git-gui/lib/branch_delete.tcl | |
parent | 58949bb18a1610d109e64e997c41696e0dfe97c3 (diff) | |
parent | 76bb40cde0e15e8d0e8493abb0bd18a5d6386ad7 (diff) | |
download | git-1fbb58b4153e90eda08c2b022ee32d90729582e6.tar.gz |
Merge git://repo.or.cz/git-gui
* git://repo.or.cz/git-gui:
git-gui: Delete branches with 'git branch -D' to clear config
git-gui: Setup branch.remote,merge for shorthand git-pull
git-gui: Update German translation
git-gui: Don't use '$$cr master' with aspell earlier than 0.60
git-gui: Report less precise object estimates for database compression
Diffstat (limited to 'git-gui/lib/branch_delete.tcl')
-rw-r--r-- | git-gui/lib/branch_delete.tcl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-gui/lib/branch_delete.tcl b/git-gui/lib/branch_delete.tcl index 86c4f73370..ef1930b491 100644 --- a/git-gui/lib/branch_delete.tcl +++ b/git-gui/lib/branch_delete.tcl @@ -127,7 +127,7 @@ method _delete {} { foreach i $to_delete { set b [lindex $i 0] set o [lindex $i 1] - if {[catch {git update-ref -d "refs/heads/$b" $o} err]} { + if {[catch {git branch -D $b} err]} { append failed " - $b: $err\n" } } |