On Wed, Feb 20, 2013 at 4:30 PM,
<koha-devel-request@lists.koha-community.org> wrote:
Send Koha-devel mailing list submissions to
koha-devel@lists.koha-community.org
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-devel
or, via email, send a message with subject or body 'help' to
koha-devel-request@lists.koha-community.org
You can reach the person managing the list at
koha-devel-owner@lists.koha-community.org
When replying, please edit your Subject line so it is more specific
than "Re: Contents of Koha-devel digest..."
Today's Topics:
1. Re: git repository (Fridolyn SOMERS)
----------------------------------------------------------------------
Message: 1
Date: Tue, 19 Feb 2013 14:23:54 +0100
From: Fridolyn SOMERS <fridolyn.somers@biblibre.com>
To: koha-devel@lists.koha-community.org
Subject: Re: [Koha-devel] git repository
Message-ID: <51237CEA.30807@biblibre.com>
Content-Type: text/plain; charset="iso-8859-1"; Format="flowed"
Hie,
to upgrade a git repo created with "git clone":
- git remote update
- git rebase origin/master
If you want stable version, use "origin/3.10.x".
Le 04/02/2013 06:55, SANDEEP BHAVSAR a ?crit :
> Respected All
>
> I am new to git, Kindly guide me which command shall I give now for
> upgrading my koha version.
>
> --------------------------------
>
> You asked me to pull without telling me which branch you
> want to merge with, and 'branch.koha.merge' in
> your configuration file does not tell me either. Please
> specify which branch you want to merge on the command line and
> try again (e.g. 'git pull <repository> <refspec>').
> See git-pull(1) for details.
>
> If you often merge with the same branch, you may want to
> configure the following variables in your configuration
> file:
>
> branch.koha.remote = <nickname>
> branch.koha.merge = <remote-ref>
> remote.<nickname>.url = <url>
> remote.<nickname>.fetch = <refspec>
>
> See git-config(1) for details.
> --------------------------------------------------------------------------------------
>
--
Fridolyn SOMERS
Biblibre - P?le Support
fridolyn.somers@biblibre.com <mailto:fridolyn.somers@biblibre.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.koha-community.org/pipermail/koha-devel/attachments/20130219/d00e4fa5/attachment-0001.html>
------------------------------
_______________________________________________
Koha-devel mailing list
Koha-devel@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-devel
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/
End of Koha-devel Digest, Vol 87, Issue 23
******************************************