All of lore.kernel.org
 help / color / mirror / Atom feed
From: Pascal Obry <pascal@obry.net>
To: Aghiles <aghilesk@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: git pull opinion
Date: Tue, 06 Nov 2007 19:07:04 +0100	[thread overview]
Message-ID: <4730AD48.2050907@obry.net> (raw)
In-Reply-To: <3abd05a90711051352t2f6be00bsa862585abd370fb1@mail.gmail.com>

Aghiles a écrit :
> Hello,
> 
> I am not sure this is the best place to write about this. Anyway,
> we just switched a couple of repositories to git (from svn) here
> at work and one thing people find annoying is a pull into
> a dirty directory. Before the "stash" feature it was even worse
> but now we can type:
> 
>     git stash
>     git pull
>     git stash apply
> 
> But isn't that something we should be able to specify to the "pull"
> command ? Additionally and if I am not mistakn, those commands will
> create "dangling" commits and blobs. So one has to execute:
> 
>     git prune
> 
> Is there an "easier" way to pull into a dirty directory ? 

I'm using:

$ git config --global alias.update '!git stash && git pull && git stash
apply'

Then in a git repository just do:

$ git update

> ps; if someone is interested to hear what is the general opinion
> on switching to git from svn in our company, I could elaborate.

Would be nice to hear about that indeed.

Pascal.

-- 

--|------------------------------------------------------
--| Pascal Obry                           Team-Ada Member
--| 45, rue Gabriel Peri - 78114 Magny Les Hameaux FRANCE
--|------------------------------------------------------
--|              http://www.obry.net
--| "The best way to travel is by means of imagination"
--|
--| gpg --keyserver wwwkeys.pgp.net --recv-key C1082595

  parent reply	other threads:[~2007-11-06 18:07 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-11-05 21:52 git pull opinion Aghiles
2007-11-05 22:28 ` Jakub Narebski
2007-11-06  0:08   ` Johannes Schindelin
2007-11-06  4:22     ` Aghiles
2007-11-06 12:02       ` Johannes Schindelin
2007-11-06 18:13         ` Junio C Hamano
2007-11-06 18:28           ` Johannes Schindelin
2007-11-05 22:49 ` Alex Riesen
2007-11-05 23:33 ` Junio C Hamano
2007-11-06  0:36   ` Bill Lear
2007-11-06  0:46     ` Pierre Habouzit
2007-11-06  7:38       ` Alex Riesen
2007-11-06  8:31         ` Pierre Habouzit
2007-11-06  0:54     ` Andreas Ericsson
2007-11-06  1:16       ` Johannes Schindelin
2007-11-06  8:59         ` Andreas Ericsson
2007-11-06 12:05           ` Johannes Schindelin
2007-11-06 12:08             ` Andreas Ericsson
2007-11-06  6:30     ` Aghiles
2007-11-06  7:40       ` Alex Riesen
2007-11-06 16:36       ` Linus Torvalds
2007-11-07 21:25         ` Aghiles
2007-11-08 15:27           ` Johannes Schindelin
2007-11-10  0:36           ` Linus Torvalds
2007-11-06  0:37   ` Steven Grimm
2007-11-06  4:04   ` Aghiles
2007-11-05 23:40 ` Miklos Vajna
2007-11-06  4:16   ` Aghiles
2007-11-06  5:29     ` Benoit Sigoure
2007-11-06  7:34       ` Ralf Wildenhues
2007-11-06 11:59         ` Johannes Schindelin
2007-11-06 20:22           ` Ralf Wildenhues
2007-11-06  7:45       ` Aghiles
2007-11-06  8:51       ` Pierre Habouzit
2007-11-07  0:26         ` [PATCH] Mark 'git stash [message...]' as deprecated Brian Downing
2007-11-07  0:26           ` [PATCH] Disable implicit 'save' argument for 'git stash' Brian Downing
2007-11-07  8:00           ` [PATCH] Mark 'git stash [message...]' as deprecated Johannes Sixt
2007-11-07  8:12             ` Wincent Colaiuta
2007-11-07  8:02           ` Junio C Hamano
2007-11-07  8:23           ` Pierre Habouzit
2007-11-06 18:07 ` Pascal Obry [this message]
2007-11-07  7:06   ` git pull opinion Uwe Kleine-König
2007-11-07  7:40     ` Pascal Obry

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4730AD48.2050907@obry.net \
    --to=pascal@obry.net \
    --cc=aghilesk@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.