Re: squashing patches

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Stephan Beyer
Date: Monday, June 9, 2008 - 1:43 pm

> > Comments? Opinions? Ideas?

Something "like" this was my veeeery first approach: "edit" with commit
was the backwards-compatible "edit" and without arguments was your
"pause".
Example:
	pick ea7beef
	edit		# or "pause" as you suggested
After a little discussion this became:
	pick --edit ea7beef

And I can't objectively say what's better


Yes.


That's right.  See the RFC/PATCH about git-squash mail or its parent
mail[1] ;-)

 1. http://article.gmane.org/gmane.comp.version-control.git/84391 2) ff.
    and
    http://article.gmane.org/gmane.comp.version-control.git/84420

The open question is, if we should do this by a natural number <n> or
by a commit.
The natural number approach seems easier, but imagine someone pauses
and does some commits (not --amend)... Here the behavior of these
approaches differs. ;-)


Eh, why?


Ok. "file" and "patch" were both choices to me. Don't know, why I
decided for "file".


Right. ;)

Regards and thanks,
  Stephan

-- 
Stephan Beyer <s-beyer@gmx.net>, PGP 0x6EDDD207FCC5040F
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[RFC] git-sequencer.txt, Stephan Beyer, (Sat Jun 7, 3:01 pm)
squashing patches (was: Re: [RFC] git-sequencer.txt), Stephan Beyer, (Mon Jun 9, 4:45 am)
Re: squashing patches (was: Re: [RFC] git-sequencer.txt), Johannes Schindelin, (Mon Jun 9, 7:04 am)
Re: squashing patches, Paolo Bonzini, (Mon Jun 9, 8:10 am)
Re: squashing patches, Paolo Bonzini, (Mon Jun 9, 8:43 am)
Re: squashing patches, Stephan Beyer, (Mon Jun 9, 9:29 am)
Re: squashing patches, Paolo Bonzini, (Mon Jun 9, 9:37 am)
Re: [RFC] git-sequencer.txt, Jakub Narebski, (Mon Jun 9, 9:49 am)
Re: squashing patches, Junio C Hamano, (Mon Jun 9, 12:34 pm)
[RFC/PATCH] Add git-squash tool and tests, Stephan Beyer, (Mon Jun 9, 1:29 pm)
Re: [RFC/PATCH] Add git-squash tool and tests, Johannes Schindelin, (Mon Jun 9, 1:34 pm)
Re: squashing patches, Stephan Beyer, (Mon Jun 9, 1:43 pm)
Re: squashing patches, Jeff King, (Mon Jun 9, 1:53 pm)
Re: [RFC/PATCH] Add git-squash tool and tests, Paolo Bonzini, (Mon Jun 9, 1:53 pm)
Re: squashing patches, Junio C Hamano, (Mon Jun 9, 2:02 pm)
Re: [RFC/PATCH] Add git-squash tool and tests, Johannes Schindelin, (Mon Jun 9, 2:34 pm)
Re: [RFC/PATCH] Add git-squash tool and tests, Stephan Beyer, (Mon Jun 9, 4:42 pm)
Re: [RFC/PATCH] Add git-squash tool and tests, Stephan Beyer, (Mon Jun 9, 4:46 pm)
Re: squashing patches, Stephan Beyer, (Mon Jun 9, 4:57 pm)
Re: [RFC/PATCH] Add git-squash tool and tests, Johannes Schindelin, (Mon Jun 9, 5:26 pm)
Re: squashing patches, Stephan Beyer, (Mon Jun 9, 5:38 pm)
Re: squashing patches, Jeff King, (Mon Jun 9, 6:00 pm)
Re: [RFC] git-sequencer.txt, Stephan Beyer, (Mon Jun 9, 6:21 pm)
Re: [RFC] git-sequencer.txt, Christian Couder, (Mon Jun 9, 9:46 pm)
Re: [RFC] git-sequencer.txt, Jakub Narebski, (Mon Jun 9, 11:17 pm)
Re: [RFC] git-sequencer.txt, Stephan Beyer, (Tue Jun 10, 1:59 am)
Re: [RFC] git-sequencer.txt, Christian Couder, (Tue Jun 10, 9:10 pm)
Re: [RFC] git-sequencer.txt, Daniel Barkalow, (Wed Jun 11, 10:07 am)
[RFCv2/FYI] git-sequencer.txt, Stephan Beyer, (Wed Jun 11, 5:22 pm)
Re: [RFCv2/FYI] git-sequencer.txt, Paolo Bonzini, (Wed Jun 11, 6:31 pm)
Re: [RFCv2/FYI] git-sequencer.txt, Junio C Hamano, (Wed Jun 11, 10:16 pm)
Re: [RFCv2/FYI] git-sequencer.txt, Jakub Narebski, (Thu Jun 12, 7:10 am)
Re: [RFCv2/FYI] git-sequencer.txt, Stephan Beyer, (Thu Jun 12, 8:29 am)
Re: [RFCv2/FYI] git-sequencer.txt, Paolo Bonzini, (Thu Jun 12, 8:56 am)
Re: [RFCv2/FYI] git-sequencer.txt, Stephan Beyer, (Thu Jun 12, 10:07 am)
Re: [RFCv2/FYI] git-sequencer.txt, Stephan Beyer, (Thu Jun 12, 10:20 am)
Re: [RFCv2/FYI] git-sequencer.txt, Paolo Bonzini, (Thu Jun 12, 10:04 pm)
Re: [RFCv2/FYI] git-sequencer.txt, Stephan Beyer, (Fri Jun 13, 5:16 am)
Re: [RFCv2/FYI] git-sequencer.txt, Paolo Bonzini, (Fri Jun 13, 7:42 am)
Re: [RFCv2/FYI] git-sequencer.txt, Olivier Marin, (Fri Jun 13, 12:24 pm)