]> git.madduck.net Git - etc/myrepos.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

projects / etc / myrepos.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d62ba8d)
add branch cleanup code to code/mr
authormartin f. krafft <madduck@madduck.net>
Tue, 24 Aug 2010 09:10:25 +0000 (11:10 +0200)
committermartin f. krafft <madduck@madduck.net>
Tue, 24 Aug 2010 09:10:25 +0000 (11:10 +0200)
.mr/base patch | blob | history

diff --git a/.mr/base b/.mr/base
index a34668de35440e508970fb4acc4b47eb3cc423b6..059b59062ca9f7067cc34165fae5ec9edc908045 100644 (file)
--- a/.mr/base
+++ b/.mr/base
@@ -34,7 +34,10 @@ checkout = checkout_hack_branch mr \
         ln -fs ../code/mr/mr ~/.bin/mr
         git branch vcsh origin/vcsh
 update = case "$(git config --get remote.origin.url)" in
         ln -fs ../code/mr/mr ~/.bin/mr
         git branch vcsh origin/vcsh
 update = case "$(git config --get remote.origin.url)" in
-           *git.madduck.net*) git pull "$@";;
+           *git.madduck.net*|madduck:*)
+              git branch -D fu 2>/dev/null || :
+              git branch -r -d origin/fu 2>/dev/null || :
+              git pull "$@";;
            *) git remote add joeyh git://git.kitenet.net/mr || :
               git fetch joeyh
               git checkout -b joeyh joeyh/master || :
            *) git remote add joeyh git://git.kitenet.net/mr || :
               git fetch joeyh
               git checkout -b joeyh joeyh/master || :
myrepos configuration

Legalese

All content available in this repository is copyright © martin f. krafft, unless otherwise noted.

All files and their content are released under the terms of the Artistic Licence 2.0, unless otherwise noted.

The operator of this repository shall not be held liable for offending content in pages linking to or linked from these page, nor does he endorse their content unless stated otherwise.