Skip to Content.
Sympa Menu

sm-commit - Re: [SM-Commit] GIT changes to master grimoire by Flavien Bridault (d699086195555f48071499d1c5695cc74aa48c50)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Flavien Bridault <vlaaad AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: Re: [SM-Commit] GIT changes to master grimoire by Flavien Bridault (d699086195555f48071499d1c5695cc74aa48c50)
  • Date: Tue, 15 Aug 2006 19:26:21 +0200

Le mardi 15 août 2006 à 19:11 +0200, Arwed von Merkatz a écrit :
> On Mon, Aug 14, 2006 at 06:44:17PM -0500, Flavien Bridault wrote:
> > GIT changes to master grimoire by Flavien Bridault
> > <vlaaad AT sourcemage.org>:
> >
> > disk/udev/DETAILS | 2 +-
> > disk/udev/HISTORY | 4 ++++
> > 2 files changed, 5 insertions(+), 1 deletion(-)
> >
> > New commits:
> > commit d699086195555f48071499d1c5695cc74aa48c50
> > Author: Flavien Bridault <vlaaad AT sourcemage.org>
> > Commit: Flavien Bridault <vlaaad AT sourcemage.org>
> >
> > HISTORY entry to explain the reason of the PATCHLEVEL++
> >
> > commit bfb2f7e4ae69209675059108736dedef467af893
> > Author: Flavien Bridault <vlaaad AT sourcemage.org>
> > Commit: Flavien Bridault <vlaaad AT sourcemage.org>
> >
> > and of course PATCHLEVEL++ so that people get it...
>
> If you have changes that belong together in your git clone, you can
> either use git-cherry-pick -n into a new branch to collect them into a
> single commit or use git reset HEAD^2 and then commit again as a single
> commit.
> This only works as long as it's not pushed yet, but it's nice in that
> case.
>
Good idea indeed. :-) Such situations often happens.
I use cogito but I believe cg-mkpatch and cg-reset could do the same
stuff.

> > diff --git a/disk/udev/DETAILS b/disk/udev/DETAILS
> > index 00ba8c1..8ceef10 100755
> > --- a/disk/udev/DETAILS
> > +++ b/disk/udev/DETAILS
> > @@ -14,7 +14,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
> >
> > WEB_SITE=http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
> > ENTERED=20030725
> > UPDATED=20060107
> > - PATCHLEVEL=14
> > + PATCHLEVEL=15
> > DOCS="ChangeLog COPYING FAQ README docs/* RELEASE-NOTES"
> > LICENSE[0]=GPL
> > KEYWORDS="disk devices nodes modules"
> > diff --git a/disk/udev/HISTORY b/disk/udev/HISTORY
> > index e1211a5..0bde26c 100644
> > --- a/disk/udev/HISTORY
> > +++ b/disk/udev/HISTORY
> > @@ -1,3 +1,7 @@
> > +2006-08-15 Flavien Bridault <vlaaad AT sourcemage.org>
> > + * DETAILS: PATCHLEVEL++ to get the alsa rules files that was actually
> > + not integrated in git repository
> > +
> > 2006-08-13 Flavien Bridault <vlaaad AT sourcemage.org>
> > * DETAILS: Updated to 097
> > * rules.d/40-alsa.rules: Added since the file disappeared from the
> > tarball
> > _______________________________________________
> > SM-Commit mailing list
> > SM-Commit AT lists.ibiblio.org
> > http://lists.ibiblio.org/mailman/listinfo/sm-commit
> >
>
--
Flavien Bridault

Disk, Graphics, Graphics-libs sections Guru
Source Mage GNU/Linux - http://www.sourcemage.org

irc: vlaaad
jabber: vlaaad AT amessage.be

Attachment: signature.asc
Description: Ceci est une partie de message numériquement signée




Archive powered by MHonArc 2.6.24.

Top of Page