[git-users] can I use the Git Logo in commercials ?

2012-12-19 Thread lalebarde
Hi,

I am building a new SaaS product and a new company for it. This product 
will add some functionalities to Git via hooks. So I don't modify Git nor 
redistribute it. My service will be accessible by configuring the Git 
config file.

Can I advertise my product with mention to Git ? Something like Git 
integrated or A hook for Git or Works with Git or Makes Git a 
all-in-one solution for blablabla ?

Can I use the Git logo for it ?

Where is the best place to ask permission for it ?

-- 




[git-users] Re: can I use the Git Logo in commercials ?

2012-12-19 Thread John McKown
read here:
http://git-scm.com/downloads/logos

quote

Git Logo by Jason Long http://twitter.com/jasonlong is licensed under the 
Creative 
Commons Attribution 3.0 Unported 
Licensehttp://creativecommons.org/licenses/by/3.0/
.

This license lets others distribute, remix, tweak, and build upon your 
work, even commercially, as long as they credit you for the original 
creation. This is the most accommodating of the CC licenses offered. 
Recommended for maximum dissemination and use of licensed materials.

/quote

So you can use Jason's logos or modifications of them, so long as you give 
him credit (just a simple Original logo by Jason Long, licensed under 
Creative Commons Attribution 3.0 Unported License would likely be good 
enough.

git itself is GPLv2  licensed. But I can't find anything about being 
allowed to say Git integrated or some such thing. What is really of 
concern to me is: Is a git hook part of git itself? If so, then the GPL 
would require that you distribute the source. But if a git hook is more 
like an independent program which uses git, then you wouldn't need to 
distribute source. This is definitely above my pay grade. IANAL nor do I 
play one on TV.

On Wednesday, December 19, 2012 4:59:45 AM UTC-6, lalebarde wrote:

 Hi,

 I am building a new SaaS product and a new company for it. This product 
 will add some functionalities to Git via hooks. So I don't modify Git nor 
 redistribute it. My service will be accessible by configuring the Git 
 config file.

 Can I advertise my product with mention to Git ? Something like Git 
 integrated or A hook for Git or Works with Git or Makes Git a 
 all-in-one solution for blablabla ?

 Can I use the Git logo for it ?

 Where is the best place to ask permission for it ?


-- 




Re: [git-users] Is it possible cp some file from one branch to another without switch branch

2012-12-19 Thread Konstantin Khomoutov
On Tue, 18 Dec 2012 21:24:03 -0500
wor...@alum.mit.edu (Dale R. Worley) wrote:

[...]
 |   git-blame - Show what revision and author last modified each
 | line of a file
 
 That's great! ... But the existence of git-blame means that git can,
 *in practice*, trace the history of an individual file, and even
 individual lines within a file.

True, but your choice of the word trace is actually very precise, and
that's what I was talking about in my previous mails in this thread:
Git does not *explicitly* record histories of individual files.
Instead, a line of history in Git is just a series of snapshots of the
repository state linked together to form the parent(s)-child
relationship.  Each snapshot in this graph is completely unaware about
which files are contained in its parent snapshot(s).
Hence, like with `git log`, `git blame` traverses the chain of commits,
considering each commit and applying its heuristics to detect file
renames.

-- 




Re: [git-users] can I use the Git Logo in commercials ?

2012-12-19 Thread Dale R. Worley
 From: lalebarde l.aleba...@free.fr
 
 I am building a new SaaS product and a new company for it. This product 
 will add some functionalities to Git via hooks. So I don't modify Git nor 
 redistribute it. My service will be accessible by configuring the Git 
 config file.
 
 Can I advertise my product with mention to Git ? Something like Git 
 integrated or A hook for Git or Works with Git or Makes Git a 
 all-in-one solution for blablabla ?
 
 Can I use the Git logo for it ?
 
 Where is the best place to ask permission for it ?

My understanding is that you can use the *name* Git in any sentence
that is accurate.  You have to make sure that it is clear that you are
not selling Git.  You may have to add a footnote saying that Git is a
trademark owned by [whoever it is].

The Git logo is copyrighted, and the rules regarding copyright are
different in different countries.  Generally, you have to find who
owns the copyright and get their permission to use it.

-- In any case, if there is significant money involved (and there
is), you should hire a lawyer.  (If you wanted to work with complex
software, you would hire someone who understands complex software.)

Dale

-- 




Re: [git-users] Is it possible cp some file from one branch to another without switch branch

2012-12-19 Thread Dale R. Worley
 From: Konstantin Khomoutov flatw...@users.sourceforge.net
 
  That's great! ... But the existence of git-blame means that git can,
  *in practice*, trace the history of an individual file, and even
  individual lines within a file.
 
 True, but your choice of the word trace is actually very precise, and
 that's what I was talking about in my previous mails in this thread:
 Git does not *explicitly* record histories of individual files.

What I mean by trace is able to provide the history of.  How Git
organizes its repository is not interesting to me; what information
Git can provide me is.  Like any software, Git could reorganize its
internal structure in the next revision, and as long as all the
commands continued to deliver the same information to me, it doesn't
matter to me.

Dale

-- 




[git-users] git.for solo developer

2012-12-19 Thread Dimitris Papageorgiou
Do you think git would be useful for a solo developer as I am right now?

I am developing a web app alone-no other developers.

VCS is always useful kind of aid for a developer.

But I think Git is intended more for teams of developers that wotk on the 
same project
so that they can take advantage of Git's distributed functionality.

I am asking these things because I am complete beginner in Git and in 
general to version control systems

-- 




[git-users] Re: git.for solo developer

2012-12-19 Thread Thomas Ferris Nicolaisen
On Wednesday, December 19, 2012 9:30:24 PM UTC+1, Dimitris Papageorgiou 
wrote:

 Do you think git would be useful for a solo developer as I am right now?

 I am developing a web app alone-no other developers.

 VCS is always useful kind of aid for a developer.

 But I think Git is intended more for teams of developers that wotk on the 
 same project
 so that they can take advantage of Git's distributed functionality.

 I am asking these things because I am complete beginner in Git and in 
 general to version control systems


Git works awesomely for solo projects. Just git init and you're up and 
running. Here's a starter's guide: http://rogerdudler.github.com/git-guide/
 

-- 




Re: [git-users] git.for solo developer

2012-12-19 Thread Manlio Perillo
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Il 19/12/2012 21:30, Dimitris Papageorgiou ha scritto:
 Do you think git would be useful for a solo developer as I am right now?
 

Of course.

 I am developing a web app alone-no other developers.
 
 VCS is always useful kind of aid for a developer.
 
 But I think Git is intended more for teams of developers that wotk on
 the same project
 so that they can take advantage of Git's distributed functionality.
 
 I am asking these things because I am complete beginner in Git and in
 general to version control systems
 

I'm in the same situation.
In the past I used Subversion, then Mercurial and now I'm starting to
use Git.

First of all, a DVCS is much more flexible, compared to traditional VCS.
Just think about the case when you develop some common code in a
separate library, and you want to release it under an open source license.

With a DVCS sharing it is not a problem.
In the past there was not even support for mirroring a Subversion
repository...

Another useful feature of git (and mercurial) is the ability to amend a
commit (and I use it a lot!).

Compared to Mercurial one critical benefit of Git is easy branch support.
I suggest you to read the Pro Git book, and compare it with the
Mercurial book and the Subversion book (all available free online and as
a PDF).

Working in topic branches really change your way of working.
With Mercurial usually I ended up in chaos, when I was working on
multiple things at once.


Regards   Manlio
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAlDSRnsACgkQscQJ24LbaUT69ACcCdoVshpLxQFWNBi6K2slRq9L
qNUAni2GgTsjSAUMMm3KcVC2oP/fF6gM
=8rel
-END PGP SIGNATURE-

-- 




Re: [git-users] can I use the Git Logo in commercials ?

2012-12-19 Thread lalebarde
Thanks a lot Dale and John for your help. For the logo, reading the 
licence, it looks actually alright with the credits. My software is 
independent from Git. It is just a filter that one can use from the Git 
config file. But I will care thanks to your recommandation and make clear 
assessment on what I am not and add credits for Git too. 


-- 




Re: [git-users] git.for solo developer

2012-12-19 Thread Les Nightingill
Dmitris: all my work is solo and I love git. The git command line is (for me) 
non-intuitive and inconsistent, but the ease of making ad hoc branches to try 
some ideas, and then abandon or merge is unrivaled.

Les

On Dec 19, 2012, at 12:30 PM, Dimitris Papageorgiou wrote:

 Do you think git would be useful for a solo developer as I am right now?
 
 I am developing a web app alone-no other developers.
 
 VCS is always useful kind of aid for a developer.
 
 But I think Git is intended more for teams of developers that wotk on the 
 same project
 so that they can take advantage of Git's distributed functionality.
 
 I am asking these things because I am complete beginner in Git and in general 
 to version control systems
 
 -- 
  
  

-- 




[git-users] git - svn migration question

2012-12-19 Thread Daniel Pomerantz
I have what is probably a silly question.  Short background:  I hate SVN 
and finally got my boss to agree to move to git, if I can make him happy 
with it.  I started looking at migrating today and ran the following 
command for our relatively small repo.  It should be noted that I have the 
standard /trunk/branches/tags directories from the svn_url:

git svn clone svn_url --authors-file=users.txt --no-metadata -s 
Git_Repo_Name

The repo itself looks to have been created with all revisions, but the tags 
and branches are missing.  When I CD into the directory and type git tag 
-l it comes up empty, and when I type in git show-branch I get one 
entry, which isn't really a branch at all.  Just a revision where the 
comment had b as the first letter.

For what it's worth, both the svn server and the new git installation are 
on windows boxes.  Not sure the version on svn, but I think it may have 
been Visual SVN.  svn server is the latest version of git on Windoes 
Server 2008R2 x64.

I asked for help on the irc channel before I wrote this, and didn't get 
much, but some one had me run git branch -a.  The results look about like 
this:

* master
  remotes/branch
  .
  remotes/branch
  remotes/branch@pegrev
  .
  remotes/tags/tag
  remotes/tags/tag@pegrev
  remotes/trunk

So lots of questions:  Why do some of the branches and tags show up with an 
@pegrev and not others?  Maybe it's something I don't need to worry about, 
but what is it?  Since these are showing up as remote, does that mean that 
they are in the svn repo only?  Big question I guess is what am I doing 
wrong?  How do I import my svn repo into git, complete with branches and 
tags?

As a bonus question, how do I do that into a bare git repo?  The best 
method I've found so far is to clone it local and then git clone --bare 
Git_Repo_Name git_repo_name.git  Will that even work?  Is it the best 
way for a bare repo migrated from svn?

Any help would be appreciated.

tia,

Daniel

-- 




[git-users] Help:How to merge multiple commits to one?

2012-12-19 Thread Wei Alex
Hi,All:

I need to merge multiple special commits to one.Please help me.
For example, I have some commits like this:
A-B-C-D-E.
Some of these were commited by me. I want to select them and merge them 
to one commit just like A-C-E.The new commit A  include the commit A B 
and D. 

Now I knew one method to merge multiple commits to one.
*git resest --soft HEAD^n*
***git commit --amend*
   BUT this method can just merge the TOP n commit not the special ones.
   Please tell me how can I finish this work.Thanks.

 

-- 




[git-users] git push origin :TRUNK-3814

2012-12-19 Thread k-joseph
Hi, every one, i have just began using using git and do request for your 
assistance, i want to delete a remote branch, i have already deleted it 
locally, but am getting an error , and the branch still exisits on my 
github account: this is the error: 
$ git push origin :TRUNK-3814
Enter passphrase for key '/c/Users/kaweesi joseph/.ssh/id_rsa':
remote: error: refusing to delete the current branch: refs/heads/TRUNK-3814
To g...@github.com:k-joseph/openmrs-core.git
 ! [remote rejected] TRUNK-3814 (deletion of the current branch prohibited)
error: failed to push some refs to 
'g...@github.com:k-joseph/openmrs-core.git'

please i humbly request for all your assistance 

--