[PD] git workflows (was Re: expr "copysign" function -- and submitting patches to Pd)

[IOhannes m zmoelnig]

On 2015-06-09 05:49, Chris McCormick wrote:
> On 08/06/15 22:48, Miller Puckette wrote:
>> The one bother I've noticed is that, if
>> I commit something, discover a bug, and make another commit to fix that, it
>> appears as two files in the git diff - I can't find any way to erase the
>> intervening commit.  I'm learning that 'git commit --amend' sometimes helps me
>> avoid this problem.)
> 
> On command that is pretty mindblowing (and sounds like it would work
> well for your situation) is `git rebase --interactive` - it lets you
> time travel to re-write/re-organise your commit history, squash commits
> together, change commits, etc.

in my personal workflow i found this rather unsatisfactory, as i prefer
to push sooner rather than later.
once a commit is pushed to a remote server (or more general: once the
commit has made it to multiple repositories), rewriting history becomes
a pain quickly.
it's doable, but it complicates things a lot, and i don't fully
understand why people are so concerned with having a clean commit history¹.

matters are different, if you submit patches to an upstream (e.g. when I
submit a patch to miller) who needs to review the patch (and probably
has better use of time than reviewing known-buggy patches that are
fixed-in-the-next-commit anyhow).


gfsdmr
IOhannes

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <http://lists.puredata.info/pipermail/pd-list/attachments/20150609/f29351a4/attachment.sig>