Re: [git-users] Incremental Git Push

2013-06-20 Thread Konstantin Khomoutov
On Thu, 20 Jun 2013 06:37:12 +0200 Magnus Therning mag...@therning.org wrote: Any ideas if it would be possible for Git to create a delta changeset that we could burn to DVD? Yes, this feature set is provided by the `git bundle` command [1]. 1.

[git-users] Re: Humorous description of git

2013-06-20 Thread JP3
On Sunday, June 16, 2013 10:18:17 AM UTC-7, Eric Gorr wrote: Hello. Awhile ago, I came across a rather humorous description of git, but (a) I can't remember exactly how it went or (b) where I saw it. It described git a being a tesseract inside of a manifold or some such thing. Does this

Re: [git-users] Re: Humorous description of git

2013-06-20 Thread J.P. Casler
hope!!! On Thu, Jun 20, 2013 at 3:29 AM, JP3 thirdclassma...@hotmail.com wrote: On Sunday, June 16, 2013 10:18:17 AM UTC-7, Eric Gorr wrote: Hello. Awhile ago, I came across a rather humorous description of git, but (a) I can't remember exactly how it went or (b) where I saw it. It

Re: [git-users] Incremental Git Push

2013-06-20 Thread Magnus Therning
On Thu, Jun 20, 2013 at 11:54 AM, Konstantin Khomoutov flatw...@users.sourceforge.net wrote: On Thu, 20 Jun 2013 06:37:12 +0200 Magnus Therning mag...@therning.org wrote: Any ideas if it would be possible for Git to create a delta changeset that we could burn to DVD? Yes, this feature

Re: [git-users] Merging hotfix without merging all files.

2013-06-20 Thread Konstantin Khomoutov
On Wed, 19 Jun 2013 22:24:24 -0700 (PDT) Saurav cance...@gmail.com wrote: Suppose I have a project on MASTER branch with 100s of php files. To do a bug fixing in the project, i create a separate branch *git checkout -b bugfix* Then after fixing the bug in 3 files (for eg index.php,

Re: [git-users] Merging hotfix without merging all files.

2013-06-20 Thread Shouvik
But u cannot switch branch without commiting first right? and in order or merge a branch u need to checkout to the master branch. no? Or am I missing something? Can u specify the steps pls? Thanks On Thu, Jun 20, 2013 at 5:29 PM, Konstantin Khomoutov flatw...@users.sourceforge.net wrote:

Re: [git-users] Merging hotfix without merging all files.

2013-06-20 Thread Konstantin Khomoutov
On Thu, 20 Jun 2013 17:35:54 +0530 Shouvik cance...@gmail.com wrote: Suppose I have a project on MASTER branch with 100s of php files. To do a bug fixing in the project, i create a separate branch *git checkout -b bugfix* Then after fixing the bug in 3 files (for eg index.php,

Re: [git-users] Merging hotfix without merging all files.

2013-06-20 Thread Dale R. Worley
From: Konstantin Khomoutov flatw...@users.sourceforge.net Then after fixing the bug in 3 files (for eg index.php, register.php and login.php), i merge it in the master branch *git checkout master **git merge bugfix* The above code will merge all the 3 files i made changes, but

Re: [git-users] Merging hotfix without merging all files.

2013-06-20 Thread Konstantin Khomoutov
On Thu, 20 Jun 2013 10:22:25 -0400 wor...@alum.mit.edu (Dale R. Worley) wrote: [...] Yes, pass the --no-commit option to `git merge` and it won't automatically record a merge commit but will rather leave the changes staged in the index. Then you'll be able to unstage the changes made to

[git-users] git pull --rebase error - compatibility issue?

2013-06-20 Thread Gabor Szabo
Hey Folks! On the project I work, we've been using git for version control and things have been going great. However, a couple of days ago, some developers started to get this peculiar error message, when they wanted to pull the repo: C:\Program Files (x86)\Git\bin\git.exe pull --rebase