From: "Uwe Kleine-König" <ukleinek@informatik.uni-freiburg.de>
To: Pascal Obry <pascal@obry.net>
Cc: Aghiles <aghilesk@gmail.com>, git@vger.kernel.org
Subject: Re: git pull opinion
Date: Wed, 7 Nov 2007 08:06:46 +0100 [thread overview]
Message-ID: <20071107070646.GA3417@informatik.uni-freiburg.de> (raw)
In-Reply-To: <4730AD48.2050907@obry.net>
Hello,
> I'm using:
>
> $ git config --global alias.update '!git stash && git pull && git stash apply'
I wonder how this works, if the merge produces conflicts...
Best regards
Uwe
--
Uwe Kleine-König
http://www.google.com/search?q=1+year+in+days
next prev parent reply other threads:[~2007-11-07 7:34 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 ` git pull opinion Pascal Obry
2007-11-07 7:06 ` Uwe Kleine-König [this message]
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=20071107070646.GA3417@informatik.uni-freiburg.de \
--to=ukleinek@informatik.uni-freiburg.de \
--cc=aghilesk@gmail.com \
--cc=git@vger.kernel.org \
--cc=pascal@obry.net \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).