From: Achim Gratz <Stromeko@nexgo.de>
To: emacs-devel@gnu.org
Subject: Re: Cluttering the git tree
Date: Thu, 20 Nov 2014 19:27:46 +0100 [thread overview]
Message-ID: <87lhn5d8wt.fsf@Gertrud.fritz.box> (raw)
In-Reply-To: 87k32pzs42.fsf@web.de
Ulf Jasper writes:
>> Another idea is to put your intermediate commits into a new branch and
>> then merge them into master with git merge --squash.
>
> That is, what I was looking for. Thank you, Bill!
No, that's a terrible idea, please forget it immediately.
> This is how I (will) work: I am not changing files on the master branch
> but on a temporary branch, while keeping the master branch synced with
> the public repository, like so:
>
> a - b - c - d master
> \
> x - y - z temporary
>
> I am doing commits on the temporary branch so that I can easily switch
> branches. Once I have finished working on the temporary thing I merge
> the *results* of that work into the master branch
>
> git checkout master
> git merge --squash temporary
Presumably there was some logic for you to do x, y and z in that order.
If you squash, that gets lost to anyone reading the change. If you want
to present a different logic now that you've implemented everything you
should maybe rewrite your branch to t-u-v-w, but certainly not squash
it. Unless it really is a trivial thing that should have been a single
commit all along.
Regards,
Achim.
--
+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+
SD adaptations for KORG EX-800 and Poly-800MkII V0.9:
http://Synth.Stromeko.net/Downloads.html#KorgSDada
next prev parent reply other threads:[~2014-11-20 18:27 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-17 20:51 Cluttering the git tree Ulf Jasper
2014-11-17 22:36 ` David Kastrup
2014-11-17 22:53 ` Lars Magne Ingebrigtsen
2014-11-17 23:14 ` Andreas Schwab
2014-11-20 6:18 ` Rob Browning
2014-11-20 5:03 ` Bill Wohler
2014-11-20 17:42 ` Ulf Jasper
2014-11-20 18:27 ` Achim Gratz [this message]
2014-11-20 19:01 ` Ulf Jasper
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=87lhn5d8wt.fsf@Gertrud.fritz.box \
--to=stromeko@nexgo.de \
--cc=emacs-devel@gnu.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.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
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.