Permalink
Browse files

Update debian/changelog for dummy release 0.6-0

  • Loading branch information...
1 parent e7ff64f commit cde8b3b976c4e04658d29062da2856359fdd3f38 Ximin Luo committed with Dec 28, 2011
Showing with 2 additions and 2 deletions.
  1. +2 −2 debian/changelog
View
@@ -1,5 +1,5 @@
-firefox-gnome-keyring (0.5.1-1) experimental; urgency=low
+mozilla-gnome-keyring (0.6-0) UNRELEASED; urgency=low
* Initial release.
- -- Ximin Luo <infinity0@gmx.com> Wed, 06 Jul 2011 20:28:16 +0100
+ -- Ximin Luo <infinity0@gmx.com> Wed, 28 Dec 2011 12:11:33 +0000

3 comments on commit cde8b3b

This is a duplicate of commit infinity0/firefox-gnome-keyring@2bbed8e1b7d8ed71f199a3a18a2334f5b5c4d55b which means you've done some weird thing using git-rebase. It's not good to keep things like this as it clutters up the history. Please get rid of it.

Owner

nougad replied Feb 3, 2012

Yes, it's right. I rebased the branches for debian/ubuntu/fedora. I thought it's better to have ha common master branch and only apply distribution specific patches on top of it. So you can clearly see which changes are required for which distribution and the patches are always up to date with the common master.

I see. I understand the intention, and it's alright for private branches, but once you publish a commit to the public, you're not supposed to change it. There are various warning signs dotted around git itself that discourage this.

To "clearly see which changes are required for which distribution" one can do "git diff master debian" or "git diff master gentoo" or some equivalent :) Also, graphical history viewers (like gitk or gitg) make it easy to see the actual individual commits that are unique to a particular branch.

Please sign in to comment.