]> git.madduck.net Git - code/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 / code / myrepos.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: fd59f44)
Use pass --pull to bzr merge to avoid needing to commit merged changes. Closes: ...
authorJoey Hess <joey@gnu.kitenet.net>
Thu, 16 Apr 2009 17:12:25 +0000 (13:12 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Thu, 16 Apr 2009 17:12:25 +0000 (13:12 -0400)
debian/changelog patch | blob | history
mr patch | blob | history

diff --git a/debian/changelog b/debian/changelog
index 34636e2bdfe770574e4454fd74efebbc14e15f8f..8764a34a59c2c5fbea9d9ba59a473cd28d967866 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mr (0.40) UNRELEASED; urgency=low
+
+  * Use pass --pull to bzr merge to avoid needing to commit
+    merged changes. Closes: #524352
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 16 Apr 2009 13:11:53 -0400
+
 mr (0.39) unstable; urgency=low
 
   * Determine current branch for fake-bare update (martin f. krafft)
diff --git a/mr b/mr
index e2f9daeb9a495b7eb7fa52dece3c5beef3faac7e..a897a5fdde3f3d87158bd05d962d72ac79c131a2 100755 (executable)
--- a/mr
+++ b/mr
@@ -1275,7 +1275,7 @@ git_bare_test =
 
 svn_update = svn update "$@"
 git_update = git pull "$@"
-bzr_update = bzr merge "$@"
+bzr_update = bzr merge --pull "$@"
 cvs_update = cvs update "$@"
 hg_update  = hg pull "$@" && hg update "$@"
 darcs_update = darcs pull -a "$@"
hacking on myrepos

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.