Le Sunday 10 May 2009 04:51:56 chris at cnpbagwell.com, vous avez ?crit :
The following commit has been merged in the master branch:
commit 3ba551592c3ad71f82f6b0b2e19c248cc8fe40c1
Author: chris at cnpbagwell.com chris at cnpbagwell.com
Date: Sat May 9 21:50:35 2009 -0500
Adding
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
On 05/11/2009 12:12 AM, stef wrote:
Le Sunday 10 May 2009 04:51:56 chris at cnpbagwell.com, vous avez ?crit :
The following commit has been merged in the master branch:
commit 3ba551592c3ad71f82f6b0b2e19c248cc8fe40c1
Author: chris at cnpbagwell.comchris at cnpbagwell.com
Date: Sat May
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
Chris Bagwell chris at cnpbagwell.com wrote:
Hi,
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
On 5/10/09, chris at cnpbagwell.com chris at cnpbagwell.com wrote:
The following commit has been merged in the master branch:
commit 4d9e8138af0f399e72599631854fa266cb18a4da
Author: chris at cnpbagwell.com chris at cnpbagwell.com
Date: Thu May 7 22:06:20 2009 -0500
standardize including
Ilia Sotnikov hostcc at gmail.com wrote:
Hi,
Could you please describe in what matter using relative paths to
header files (eg. #include ../include/sane/sane.h) is better in
comparision with -I../include command line option? Just to have
cleaner picture...
This way you don't pick up
On Sun, May 10, 2009 at 2:22 PM, Julien BLACHE jb at jblache.org wrote:
Ilia Sotnikov hostcc at gmail.com wrote:
Hi,
Could you please describe in what matter using relative paths to
header files (eg. #include ../include/sane/sane.h) is better in
comparision with -I../include command line
On 05/10/2009 01:28 PM, m. allan noah wrote:
On Sun, May 10, 2009 at 2:22 PM, Julien BLACHEjb at jblache.org wrote:
Ilia Sotnikovhostcc at gmail.com wrote:
Hi,
Could you please describe in what matter using relative paths to
header files (eg. #include ../include/sane/sane.h)
