Yes, I would also appreciate if confirmation or clarification when a rebase can be used. I probably mis-interrepted Julien's useful email to mean a rebase only works when remote server has changes that do not affect your local commits; else a merge is needed.
Chris On Mon, May 11, 2009 at 8:02 AM, m. allan noah <kitno455 at gmail.com> wrote: > and here we have a merge commit like julien warned about, where my > most recent (large) commit to canon_dr shows up again in this commit. > IIRC, we should not use git pull, but instead, get fetch and git > rebase to prevent this? > > not directed at chris particularly, git and i dont seem to get along > yet, either.... > > allan > > On Sat, May 9, 2009 at 10:51 PM, chris at cnpbagwell.com > <chris at cnpbagwell.com> wrote: > > The following commit has been merged in the master branch: > > commit 07c5723cab9571524db586c3319eb40a93568107 > > Merge: 4d9e8138af0f399e72599631854fa266cb18a4da > 64621621c1e3b0163dbd62d3071df028d2cf0b34 > > Author: chris at cnpbagwell.com <chris at cnpbagwell.com> > > Date: Sat May 9 21:40:55 2009 -0500 > > > > Merge branch 'master' of ssh:// > cbagwell-guest at git.debian.org/git/sane/sane-backends > > > > diff --combined backend/canon_dr.c > > index 44cd9f3,b5d5ab3..994ee0e > > --- a/backend/canon_dr.c > > +++ b/backend/canon_dr.c > > @@@ -56,8 -56,9 +56,9 @@@ > > Section 2 - sane_init, _get_devices, _open & friends > > Section 3 - sane_*_option functions > > Section 4 - sane_start, _get_param, _read & friends > > - Section 5 - sane_close functions > > - Section 6 - misc functions > > + Section 5 - calibration functions > > + Section 6 - sane_close functions > > + Section 7 - misc functions > > > > Changes: > > v1 2008-10-29, MAN > > @@@ -182,6 -183,19 +183,19 @@@ > > v26 2009-04-14, MAN (SANE 1.0.20) > > - return cmd status for reads on sensors > > - allow rs to adjust read length for all bad status responses > > + v27 2009-05-08, MAN > > + - bug fix in read_panel() > > + - initialize vars in do_usb_cmd() > > + - set buffermode off by default > > + - clear page counter during init and sane_start() > > + - eject previous page during init and sane_start() > > + - improved SSM_BUFF macros > > + - moved set_window() to after ssm-*() > > + - add coarse calibration (AFE offset/gain & per-channel > exposure) > > + - add fine calibration (per-cell offset/gain) > > + - free image and fine cal buffers in sane_close() > > + - compare page counter of small scanners only in non-buffered > mode > > + - add back-side gray mirroring code for DR-2580C > > -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.alioth.debian.org/pipermail/sane-devel/attachments/20090511/b4edefd4/attachment.htm>
