git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jon Loeliger <jdl@freescale.com>
To: Andreas Ericsson <ae@op5.se>
Cc: Boaz Harrosh <bharrosh@panasas.com>,
	Junio C Hamano <gitster@pobox.com>,
	Steven Walter <stevenrwalter@gmail.com>,
	git@vger.kernel.org, jeske@google.com
Subject: Re: [PATCH] cmd_reset: don't trash uncommitted changes unless told to
Date: Thu, 26 Jun 2008 11:15:03 -0500	[thread overview]
Message-ID: <4863C087.1070304@freescale.com> (raw)
In-Reply-To: <486329C9.8020801@op5.se>

Andreas Ericsson wrote:

> There is a "--hard" after one of them. It reads like this:
> 
> git reset --hard  ;# move current branch to random point in history
>                   # discarding working tree and index state
> 
> git reset --mixed ;# move current branch to random point in history
>                   # discard the index but keep the working tree
> 
> git reset --soft  ;# move current branch to random point in history,
>                   # leaving index and working tree intact

I always thought that these would be best presented in
a linear ordering so that the effects were clearly
shown in an "increasing" way:

--soft
    - touches one thing

--mixed
    - touches one thing and a second
    - this is the default

--hard
    - touches one thing, a second and a third

Want a patch down that line?

jdl

  reply	other threads:[~2008-06-26 16:17 UTC|newest]

Thread overview: 100+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <jeske@willow=01l5V7waFEDjChmh>
     [not found] ` <willow-jeske-01l5PFjPFEDjCfzf-01l5V7wbFEDjCX7V>
2008-06-24  1:47   ` why is git destructive by default? (i suggest it not be!) David Jeske
2008-06-24  1:47   ` David Jeske
2008-06-24 17:11     ` Boaz Harrosh
2008-06-24 17:19       ` Boaz Harrosh
2008-06-24 19:08         ` Jakub Narebski
     [not found]           ` <willow-jeske-01l5PFjPFEDjCfzf-01l5zrLdFEDjCV3U>
2008-06-24 20:04             ` David Jeske
2008-06-24 20:04             ` David Jeske
2008-06-24 21:42               ` Brandon Casey
     [not found]                 ` <willow-jeske-01l5PFjPFEDjCfzf-01l63P33FEDjCVQ0>
2008-06-24 22:13                   ` David Jeske
2008-06-24 22:13                   ` David Jeske
2008-06-24 22:54                 ` Theodore Tso
2008-06-24 23:07                   ` Junio C Hamano
2008-06-25  2:26                     ` Theodore Tso
2008-06-25  8:58                       ` Jakub Narebski
2008-06-25  9:14                         ` Junio C Hamano
2008-06-26 15:13                       ` Brandon Casey
2008-06-24 22:21               ` Steven Walter
2008-06-24 22:21                 ` [PATCH] cmd_reset: don't trash uncommitted changes unless told to Steven Walter
2008-06-24 22:31                   ` Junio C Hamano
2008-06-25  9:12                     ` Boaz Harrosh
2008-06-25  9:23                       ` Junio C Hamano
2008-06-25  9:59                         ` Boaz Harrosh
2008-06-25 10:16                       ` Johannes Schindelin
2008-06-25 10:24                         ` Matthias Kestenholz
2008-06-25 10:46                           ` Anton Gladkov
2008-06-25 12:33                             ` Johannes Schindelin
2008-06-25 14:49                             ` [PATCH] cmd_reset: don't trash uncommitted changes unless toldto Craig L. Ching
2008-06-25 15:18                               ` Anton Gladkov
2008-06-25 10:41                         ` [PATCH] cmd_reset: don't trash uncommitted changes unless told to Johannes Sixt
2008-06-25 12:38                           ` Johannes Schindelin
2008-06-25 13:51                             ` Theodore Tso
2008-06-25 17:22                               ` Junio C Hamano
2008-06-25 19:50                                 ` Theodore Tso
2008-06-25 20:04                                   ` Avery Pennarun
2008-06-25 20:11                                     ` Junio C Hamano
2008-06-25 20:22                                       ` Avery Pennarun
2008-06-25 20:48                                         ` Junio C Hamano
2008-06-25 20:58                                           ` Avery Pennarun
2008-06-25 21:24                                             ` Re* " Junio C Hamano
2008-06-25 21:34                                               ` Junio C Hamano
2008-06-26  1:26                                               ` Junio C Hamano
2008-06-25 20:37                                       ` Steven Walter
2008-06-25 20:38                                     ` Theodore Tso
2008-06-25 20:50                                       ` Junio C Hamano
2008-06-25 21:05                                         ` Theodore Tso
2008-06-25 21:35                                           ` Junio C Hamano
2008-06-26  5:16                                             ` Junio C Hamano
     [not found]                                             ` <20080627193325.6117@nanako3.lavabit.com>
2008-06-27 22:11                                               ` Junio C Hamano
2008-06-28  0:06                                                 ` しらいしななこ
2008-06-28 22:32                                                   ` しらいしななこ
2008-06-29  8:56                                                     ` Junio C Hamano
2008-06-25 22:44                                       ` Petr Baudis
2008-06-26  1:59                                         ` Johannes Schindelin
2008-06-25 20:09                                   ` Junio C Hamano
2008-06-26 11:55                                 ` Björn Steinbrink
2008-06-26 12:07                                   ` Johannes Schindelin
2008-06-26 12:35                                     ` Björn Steinbrink
2008-06-26 15:55                                     ` Avery Pennarun
2008-06-26 17:49                                       ` Johannes Schindelin
2008-06-26 12:01                               ` Matthieu Moy
2008-06-26 12:09                                 ` Johannes Schindelin
2008-06-26 12:23                                   ` David Kastrup
2008-06-25 13:19                       ` Ian Hilt
2008-06-26  5:31                       ` Andreas Ericsson
2008-06-26 16:15                         ` Jon Loeliger [this message]
2008-06-25  5:29                   ` Johannes Gilger
2008-06-25  8:57           ` why is git destructive by default? (i suggest it not be!) Boaz Harrosh
2008-06-24 18:18       ` Brandon Casey
     [not found] ` <willow-jeske-01l5PFjPFEDjCfzf-01l5V7wbFEDjCX7V@videotron.ca>
     [not found]   ` <willow-jeske-01l5cKsCFEDjC=91MX@videotron.ca>
2008-06-24  2:17     ` Nicolas Pitre
     [not found]       ` <willow-jeske-01l5PFjPFEDjCfzf-01l5ciVtFEDjCaD9>
2008-06-24  3:18         ` David Jeske
2008-06-24  8:14           ` Lea Wiemann
2008-06-24  3:18         ` David Jeske
     [not found]       ` <willow-jeske-01l5PFjPFEDjCfzf-01l5ciVtFEDjCaD9@videotron.ca>
     [not found]         ` <willow-jeske-01l5e9cgFEDjCh3F@videotron.ca>
2008-06-24  4:03           ` Nicolas Pitre
     [not found]             ` <willow-jeske-01l5PFjPFEDjCfzf-01l5fAcTFEDjCWA4>
2008-06-24  4:40               ` David Jeske
2008-06-24  5:24                 ` Jan Krüger
2008-06-24  4:40               ` David Jeske
     [not found]             ` <1978205964779154253@unknownmsgid>
2008-06-24  5:20               ` Avery Pennarun
     [not found]                 ` <willow-jeske-01l5PFjPFEDjCfzf-01l5gtQ7FEDjCWCC>
2008-06-24  6:35                   ` David Jeske
2008-06-24  7:24                     ` Jeff King
     [not found]                       ` <willow-jeske-01l5PFjPFEDjCfzf-01l5jmMuFEDjChvB>
2008-06-24  7:31                         ` David Jeske
2008-06-24  7:31                         ` David Jeske
2008-06-24  8:16                           ` Jeff King
     [not found]                             ` <willow-jeske-01l5PFjPFEDjCfzf-01l5kv6TFEDjCj8S>
2008-06-24  8:30                               ` David Jeske
2008-06-24  9:39                                 ` Jakub Narebski
2008-06-24  8:30                               ` David Jeske
     [not found]                             ` <willow-jeske-01l5PFjPFEDjCfzf-01l5kv6TFEDjCj8S@brm-avmta-1.central.sun.com>
     [not found]                               ` <willow-jeske-01l5lTEoFEDjCVta@brm-avmta-1.central.sun.com>
2008-06-24 10:01                                 ` Fedor Sergeev
2008-06-24 10:24                                   ` David Jeske
2008-06-24 13:13                                     ` Theodore Tso
2008-06-24  6:35                   ` David Jeske
2008-06-24  7:54                 ` Jakub Narebski
     [not found]                   ` <willow-jeske-01l5PFjPFEDjCfzf-01l5kQf4FEDjCXUa>
2008-06-24  8:08                     ` David Jeske
2008-06-24  8:08                     ` David Jeske
2008-06-24 11:22                       ` Jakub Narebski
     [not found]                         ` <willow-jeske-01l5PFjPFEDjCfzf-01l5p7eVFEDjCZRD>
2008-06-24 11:29                           ` David Jeske
2008-06-24 12:19                             ` Rogan Dawes
2008-06-24 12:35                               ` Johannes Gilger
2008-06-24 12:46                                 ` Rogan Dawes
2008-06-24 11:29                           ` David Jeske
2008-06-24 12:21                             ` Jakub Narebski
2008-06-24 12:13                         ` Jakub Narebski

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=4863C087.1070304@freescale.com \
    --to=jdl@freescale.com \
    --cc=ae@op5.se \
    --cc=bharrosh@panasas.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jeske@google.com \
    --cc=stevenrwalter@gmail.com \
    /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).