From: David Mansfield <david@cobite.com>
To: Petr Baudis <pasky@ucw.cz>
Cc: Ingo Molnar <mingo@elte.hu>,
Martin Schlemmer <azarah@nosferatu.za.org>,
David Greaves <david@dgreaves.com>,
dwheeler@dwheeler.com, Daniel Barkalow <barkalow@iabervon.org>,
git@vger.kernel.org
Subject: Re: Change "pull" to _only_ download, and "git update"=pull+merge?
Date: Wed, 20 Apr 2005 19:58:58 -0400 [thread overview]
Message-ID: <4266ECC2.6060202@cobite.com> (raw)
In-Reply-To: <20050420211505.GE19112@pasky.ji.cz>
Petr Baudis wrote:
> Dear diary, on Wed, Apr 20, 2005 at 10:32:35PM CEST, I got a letter
> where Ingo Molnar <mingo@elte.hu> told me that...
>
>>* Petr Baudis <pasky@ucw.cz> wrote:
>>
>>
>>>>yet another thing: what is the canonical 'pasky way' of simply nuking
>>>>the current files and checking out the latest tree (according to
>>>>.git/HEAD). Right now i'm using a script to:
>>>>
>>>> read-tree $(tree-id $(cat .git/HEAD))
>>>> checkout-cache -a
>>>>
>>>>(i first do an 'rm -f *' in the working directory)
>>>>
>>>>i guess there's an existing command for this already?
>>>
>>>git cancel
>>
>>hm, that's a pretty unintuitive name though. How about making it 'git
>>checkout' and providing a 'git checkout -f' option to force the
>>checkout? (or something like this)
>
>
> Since it does not really checkout. Ok, it does, but that's only small
> part of it. It just cancels whatever local changes are you doing in the
> tree and bring it to consistent state. When you have a merge in progress
> and after you see the sheer number of conflicts you decide to get your
> hands off, you type just git cancel. Doing basically anything with your
> tree (not only local changes checkout would fix, but also various git
> operations, including git add/rm and git seek) can be easily fixed by
> git cancel.
How about 'git revert'?
Most editors and word processors use that idiom for revert to saved
copy, with the obvious parallel here.
David
next prev parent reply other threads:[~2005-04-20 23:55 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-04-16 1:56 [PATCH] Add "clone" support to lntree Daniel Barkalow
2005-04-16 2:47 ` Petr Baudis
2005-04-16 2:58 ` Petr Baudis
2005-04-16 3:16 ` Linus Torvalds
2005-04-16 11:39 ` Petr Baudis
2005-04-16 3:17 ` Daniel Barkalow
2005-04-16 23:33 ` Petr Baudis
2005-04-17 0:07 ` Daniel Barkalow
2005-04-19 1:12 ` Petr Baudis
2005-04-19 2:13 ` Change "pull" to _only_ download, and "git update"=pull+merge? David A. Wheeler
2005-04-19 9:18 ` David Greaves
2005-04-19 9:28 ` Petr Baudis
2005-04-19 10:05 ` Martin Schlemmer
2005-04-19 10:50 ` Petr Baudis
2005-04-19 13:54 ` Jon Seymour
2005-04-19 14:40 ` Martin Schlemmer
2005-04-19 18:28 ` Daniel Barkalow
2005-04-19 22:39 ` David A. Wheeler
2005-04-19 23:20 ` Daniel Barkalow
2005-04-20 7:01 ` Ingo Molnar
2005-04-20 20:05 ` Petr Baudis
2005-04-20 20:32 ` Ingo Molnar
2005-04-20 20:45 ` Ingo Molnar
2005-04-20 21:15 ` Petr Baudis
2005-04-20 23:58 ` David Mansfield [this message]
2005-04-16 3:06 ` Add "clone" support to lntree Daniel Barkalow
2005-04-16 23:00 ` Petr Baudis
2005-04-16 23:07 ` Daniel Barkalow
2005-04-16 23:44 ` Petr Baudis
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4266ECC2.6060202@cobite.com \
--to=david@cobite.com \
--cc=azarah@nosferatu.za.org \
--cc=barkalow@iabervon.org \
--cc=david@dgreaves.com \
--cc=dwheeler@dwheeler.com \
--cc=git@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=pasky@ucw.cz \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).