Thanks a lot for the git help, it works fine :-)
I'm rebuilding unofficial rpms.
Available here: http://olivier.lahaye1.free.fr/RPMS/noarch/
(source rpm: http://olivier.lahaye1.free.fr/SRPMS/)
Now, the make source_tarball is corking with git structure and rpm build from
tar archive works fine:
From the SystemImager root dir:
make source_tarball
rpmbuild -ta tmp/systemimager-4.3.0.tar.bz2
(Build still need root privileges for now as the spec file needs to create
device inodes and I did not yet look at the problem)
Cheers,
Olivier.
--
Olivier LAHAYE
CEA DRT/LIST/DCSI/DIR
________________________________________
De : Brian Finley [br...@thefinleys.com]
Date d'envoi : lundi 7 janvier 2013 22:29
À : LAHAYE Olivier
Cc: sisuite-devel@lists.sourceforge.net
Objet : Re: [Sisuite-devel] git howto?
I'm not yet a git expert myself either, but this is what I've been using
with success:
┌─[bfinley@bob] ~/src/systemimager.git/ master ⚡
└─[$] git commit -m "verbiage" README
[master d309549] verbiage
1 file changed, 2 deletions(-)
┌─[bfinley@bob] ~/src/systemimager.git/ master
└─[$] git push
Counting objects: 5, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (3/3), done.
Writing objects: 100% (3/3), 292 bytes, done.
Total 3 (delta 2), reused 0 (delta 0)
To g...@github.com:finley/SystemImager.git
80e899e..d309549 master -> master
┌─[bfinley@bob] ~/src/systemimager.git/ master
└─[$] git status
# On branch master
nothing to commit (working directory clean)
Cheers, -Brian
On 01/07/2013 11:42 AM, LAHAYE Olivier wrote:
> Hi,
>
> Sorry to disturb the list with this, but I'm pure newbee in git and
> despite my googleling, I'm unable to understand how to merge back all my
> changes.
>
> I've setup my git like this:
>
> $ git config --global user.email "my email"
>
> $ git config --global user.name "my login"
>
> $ git config --global core.autocrlf input
>
> $ git config --global core.safecrlf true
>
> $ git clone https://github.com/finley/SystemImager.git
>
>
> Then I did commit my changes, and now I'd like to merge, what should I
> do to merge back my fixes? I've tryed the following with no success:
>
> $ git merge master
> Already up-to-date.
>
> $ git status
> # On branch master
> # Your branch is ahead of 'origin/master' by 15 commits.
> #
> nothing to commit (working directory clean)
>
> My current git is clean and doing make source_tarball and rpmbuild -tb
> rpm/systemiamger-4.3.0.tar.bz2 produces correct rpm with all my fixes
> including my last bugfix.
>
> Many thanks for your help.
>
> Regards,
>
> Olivier.
> --
> Olivier LAHAYE
> CEA DRT/LIST/DCSI/DIR
>
>
> ------------------------------------------------------------------------------
> Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
> MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
> with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
> MVPs and experts. SALE $99.99 this month only -- learn more at:
> http://p.sf.net/sfu/learnmore_122412
>
>
>
> _______________________________________________
> sisuite-devel mailing list
> sisuite-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/sisuite-devel
>
--
Brian Elliott Finley
Mobile: 469.444.0167
------------------------------------------------------------------------------
Master SQL Server Development, Administration, T-SQL, SSAS, SSIS, SSRS
and more. Get SQL Server skills now (including 2012) with LearnDevNow -
200+ hours of step-by-step video tutorials by Microsoft MVPs and experts.
SALE $99.99 this month only - learn more at:
http://p.sf.net/sfu/learnmore_122512
_______________________________________________
sisuite-devel mailing list
sisuite-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/sisuite-devel
