[git-users] git merge multiple commits as single commit?

2014-01-17 Thread Tony M
Hi All, I have a personal branch of the master branch and work in my personal branch. Once I have a feature ready in my branch, I pull the latest from the master branch(which is updated by other users as well), and then merge the latest to my branch then push my branch to master (I know

Re: [git-users] git merge multiple commits as single commit?

2014-01-17 Thread Gergely Polonkai
Hello, at step 4 I would do a rebase instead of a merge. This way when you merge your local changes to master in step 6, you can do an interactive rebase, and squash all your local commits into one general commit. I don’t see your problem though, why is it a problem that your changes appear as

[git-users] Checking out Revisions

2014-01-17 Thread nbalkanas
I need to check out a revision from a repository, that supports only git. I don't know much about git, but I am used to svn. It seems that git first needs s clone before doing anything. And that clone would be the current version - the wrong one in my case. After that I do: git checkout

Re: [git-users] Checking out Revisions

2014-01-17 Thread Konstantin Khomoutov
On Fri, 17 Jan 2014 05:08:15 -0800 (PST) nbalka...@gmail.com wrote: I need to check out a revision from a repository, that supports only git. I don't know much about git, but I am used to svn. It seems that git first needs s clone before doing anything. And that clone would be the current

Re: [git-users] Checking out Revisions

2014-01-17 Thread Nikos Balkanas
Thanks for the fast reply. I am breaking my head over it since yesterday :-( Here is the output you asked (State is after clone and checkout revision): 1) Revision: $ git describe --always --abbrev=8 --long e9a82163 $git branch -a * (no branch) master remotes/origin/HEAD - origin/master

Re: [git-users] Checking out Revisions

2014-01-17 Thread Konstantin Khomoutov
On Fri, 17 Jan 2014 16:00:24 +0200 Nikos Balkanas nbalka...@gmail.com wrote: I need to check out a revision from a repository, that supports only git. I don't know much about git, but I am used to svn. It seems that git first needs s clone before doing anything. And that clone would

Re: [git-users] Checking out Revisions

2014-01-17 Thread Nikos Balkanas
On Fri, Jan 17, 2014 at 5:43 PM, Konstantin Khomoutov flatw...@users.sourceforge.net wrote: On Fri, 17 Jan 2014 16:00:24 +0200 Nikos Balkanas nbalka...@gmail.com wrote: I need to check out a revision from a repository, that supports only git. I don't know much about git, but I am used

Re: [git-users] Checking out Revisions

2014-01-17 Thread Nikos Balkanas
On Fri, Jan 17, 2014 at 6:16 PM, Konstantin Khomoutov flatw...@users.sourceforge.net wrote: On Fri, 17 Jan 2014 17:59:42 +0200 Nikos Balkanas nbalka...@gmail.com wrote: [...] OK, so you have been told to check out a revision by the SHA-1 name of its commit, and so you did. Also