[Ohrrpgce] SVN: james/9025 Re-write read_one_door() so that it really reads just one door, rather t
teeemcee at gmail.com
Wed Jul 12 22:42:55 PDT 2017
git rebase -i is incredibly useful and I use it very heavily. It lets me
put off testing/finalising commits until later.
Other things I use heavily for similar reasons are git stash (but stashing
more than one thing isn't a good idea; better to create temp branches) and
git add -p to only commit some of my changes (it's the norm that I work on
5 things at once, then split it into 3 commits using git add -p, and then
stash the rest and come back to it later... or never).
git add -i is also useful as an alternative to git add -p if you've too
many changes mixed up.
And git checkout -p to selectively throw away changes.
On 13 July 2017 at 08:49, James Paige <Bob at hamsterrepublic.com> wrote:
> I am delighted to have figured out how to squash together two commits to
> make this one commit with git rebase --interactive
> I am enjoying working through git rather than subversion more than I
> expected :)
> (the first of those commits being my initial rewrite of those functions,
> and the second squashed commit being a fix for two very embarrassing typos
> the totally broke it)
> On Wed, Jul 12, 2017 at 1:42 PM, <subversion at hamsterrepublic.com> wrote:
>> 2017-07-12 13:42:52 -0700 (Wed, 12 Jul 2017)
>> Re-write read_one_door() so that it really reads just one door, rather
>> than calling DeSerDoors() and throwing away the other 99 doors
>> Also re-factored get_door_by_map_script_arg() slghtly
>> U wip/loading.bi
>> U wip/loading.rbas
>> U wip/scriptcommands.bas
>> Ohrrpgce mailing list
>> ohrrpgce at lists.motherhamster.org
> Ohrrpgce mailing list
> ohrrpgce at lists.motherhamster.org
-------------- next part --------------
An HTML attachment was scrubbed...
More information about the Ohrrpgce