git: updating local git repo while pending changes - sr-dev

Jan Janak

7 Oct 7 Oct

5:11 p.m.

On Thu, Oct 7, 2010 at 9:49 AM, Ovidiu Sas <osas(a)voipembedded.com> wrote:

Hello all, Sometimes, while doing coding on my local git repo, I would like to synchronize my local repo with the remote one but without commiting my changes. Is there a way to do this in a simple and elegant matter?

The synchronization in git works by the way of transferring commit objects, so no, I don't think so. Also, your local uncomitted modifications are kept in files that you've checked out; remote/shared repositories are usually "bare", that means they have no checked out files. All they contain is the commit object database files (normally stored under .git). -Jan

Reply

Henning Westerholt

5:30 p.m.

On Thursday 07 October 2010, Ovidiu Sas wrote:

...

I see. I worked before with bitkeeper and I really liked the park/unpark feature. I guess I will need to cook a script to save the diff as a patch, restore the repo to clean state, pull and reapply the saved patch.

Hi Ovidiu, maybe you can take a look to git stash, i usually use this to "hide" some temporary not fixed changes if i need to do some operations on the repo that require a clean state. Cheers, Henning

Reply

Alex Balashov

7:31 p.m.

On 10/07/2010 10:11 AM, Jan Janak wrote:

...

On Thu, Oct 7, 2010 at 9:49 AM, Ovidiu Sas<osas(a)voipembedded.com> wrote:

Hello all, Sometimes, while doing coding on my local git repo, I would like to synchronize my local repo with the remote one but without commiting my changes. Is there a way to do this in a simple and elegant matter?

The synchronization in git works by the way of transferring commit objects, so no, I don't think so. Also, your local uncomitted modifications are kept in files that you've checked out; remote/shared repositories are usually "bare", that means they have no checked out files. All they contain is the commit object database files (normally stored under .git).

Why not git pull --rebase? -- Alex Balashov - Principal Evariste Systems LLC 1170 Peachtree Street 12th Floor, Suite 1200 Atlanta, GA 30309 Tel: +1-678-954-0670 Fax: +1-404-961-1892 Web: http://www.evaristesys.com/

Reply

Ovidiu Sas

7:51 p.m.

I will play with git stash (this seems to be what I'm looking for). It wasn't listed by 'git help'. Thank you all for the input. Regards, Ovidiu Sas On Thu, Oct 7, 2010 at 12:38 PM, Jan Janak <jan(a)ryngle.com> wrote:

...

On Thu, Oct 7, 2010 at 12:31 PM, Alex Balashov <abalashov(a)evaristesys.com> wrote:

On 10/07/2010 10:11 AM, Jan Janak wrote:

On Thu, Oct 7, 2010 at 9:49 AM, Ovidiu Sas<osas(a)voipembedded.com> wrote:

Hello all, Sometimes, while doing coding on my local git repo, I would like to synchronize my local repo with the remote one but without commiting my changes. Is there a way to do this in a simple and elegant matter?

The synchronization in git works by the way of transferring commit objects, so no, I don't think so. Also, your local uncomitted modifications are kept in files that you've checked out; remote/shared repositories are usually "bare", that means they have no checked out files. All they contain is the commit object database files (normally stored under .git).

Why not git pull --rebase?

Ohh, maybe I misunderstood the question. I thought that what Ovidiu wanted to do was transfer local uncommited changes into another (remote) repository. But that may not be the case. git pull --rebase works with commited changes. It fetches remote updates into the local repository, removes all local _commits_, applies the remote changes and then re-applies the local commits. But, if what Ovidiu wanted to do was preserve local changes while he is pulling updates from a remote repo into the local one, then git stash might help, as other people kindly pointed out. Sorry for the confusion. -Jan _______________________________________________ sr-dev mailing list sr-dev(a)lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Reply