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.<br>
<br>Chris<br><br><div class="gmail_quote">On Mon, May 11, 2009 at 8:02 AM, m. allan noah <span dir="ltr"><<a href="mailto:kitno455@gmail.com">kitno455@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
and here we have a merge commit like julien warned about, where my<br>
most recent (large) commit to canon_dr shows up again in this commit.<br>
IIRC, we should not use git pull, but instead, get fetch and git<br>
rebase to prevent this?<br>
<br>
not directed at chris particularly, git and i dont seem to get along<br>
yet, either....<br>
<br>
allan<br>
<div class="im"><br>
On Sat, May 9, 2009 at 10:51 PM, <a href="mailto:chris@cnpbagwell.com">chris@cnpbagwell.com</a><br>
<<a href="mailto:chris@cnpbagwell.com">chris@cnpbagwell.com</a>> wrote:<br>
> The following commit has been merged in the master branch:<br>
</div>> commit 07c5723cab9571524db586c3319eb40a93568107<br>
> Merge: 4d9e8138af0f399e72599631854fa266cb18a4da 64621621c1e3b0163dbd62d3071df028d2cf0b34<br>
<div class="im">> Author: <a href="mailto:chris@cnpbagwell.com">chris@cnpbagwell.com</a> <<a href="mailto:chris@cnpbagwell.com">chris@cnpbagwell.com</a>><br>
</div>> Date: Sat May 9 21:40:55 2009 -0500<br>
><br>
> Merge branch 'master' of ssh://<a href="http://cbagwell-guest@git.debian.org/git/sane/sane-backends" target="_blank">cbagwell-guest@git.debian.org/git/sane/sane-backends</a><br>
><br>
> diff --combined backend/canon_dr.c<br>
> index 44cd9f3,b5d5ab3..994ee0e<br>
> --- a/backend/canon_dr.c<br>
> +++ b/backend/canon_dr.c<br>
> @@@ -56,8 -56,9 +56,9 @@@<br>
> Section 2 - sane_init, _get_devices, _open & friends<br>
> Section 3 - sane_*_option functions<br>
> Section 4 - sane_start, _get_param, _read & friends<br>
> - Section 5 - sane_close functions<br>
> - Section 6 - misc functions<br>
> + Section 5 - calibration functions<br>
> + Section 6 - sane_close functions<br>
> + Section 7 - misc functions<br>
><br>
> Changes:<br>
> v1 2008-10-29, MAN<br>
> @@@ -182,6 -183,19 +183,19 @@@<br>
> v26 2009-04-14, MAN (SANE 1.0.20)<br>
> - return cmd status for reads on sensors<br>
> - allow rs to adjust read length for all bad status responses<br>
> + v27 2009-05-08, MAN<br>
> + - bug fix in read_panel()<br>
> + - initialize vars in do_usb_cmd()<br>
> + - set buffermode off by default<br>
> + - clear page counter during init and sane_start()<br>
> + - eject previous page during init and sane_start()<br>
> + - improved SSM_BUFF macros<br>
> + - moved set_window() to after ssm-*()<br>
> + - add coarse calibration (AFE offset/gain & per-channel exposure)<br>
> + - add fine calibration (per-cell offset/gain)<br>
> + - free image and fine cal buffers in sane_close()<br>
> + - compare page counter of small scanners only in non-buffered mode<br>
> + - add back-side gray mirroring code for DR-2580C<br>
<br></blockquote></div>