AF:
NF:0
PS:10
SRH:1
SFN:
DSR:
MID:<20090403182234.602c2bf0@ripper.onstor.net>
CFG:
PT:0
S:andy.sharp@onstor.com
RQ:
SSV:mail.onstor.net
NSV:
SSH:
R:<Bill.Fisher@onstor.com>
MAID:1
X-Sylpheed-Privacy-System:
X-Sylpheed-Sign:0
SCF:#mh/Mailbox/sent
RMID:#imap/andys@onstor.net@exch1.onstor.net/INBOX	0	49D6AF7B.6040407@onstor.com
X-Sylpheed-End-Special-Headers: 1
Date: Fri, 3 Apr 2009 18:23:47 -0700
From: Andrew Sharp <andy.sharp@onstor.com>
To: Bill Fisher <Bill.Fisher@onstor.com>
Subject: Re: [Fwd: git pull failures]
Message-ID: <20090403182347.14499171@ripper.onstor.net>
In-Reply-To: <49D6AF7B.6040407@onstor.com>
References: <49D6AF7B.6040407@onstor.com>
Organization: Onstor
X-Mailer: Sylpheed-Claws 2.6.0 (GTK+ 2.8.20; x86_64-pc-linux-gnu)
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit

my canned git-commit command line:

git-commit -s -m "replace this" -e --author "Andrew Sharp <andy.sharp@onstor.com>"

obviously you want to change the name parts to yourself





On Fri, 3 Apr 2009 17:53:15 -0700 Bill Fisher <Bill.Fisher@onstor.com>
wrote:

> 
> 
> -------- Original Message --------
> Subject: git pull failures
> Date: Fri, 3 Apr 2009 16:48:59 -0700
> From: Bill Fisher <Bill.Fisher@onstor.com>
> To: Bill Fisher <Bill.Fisher@onstor.com>
> 
> bfisher-linux: 4990>git pull
> ~andys/src/tuxrx/linux/kernel/linux-mips-2.6 onstor-2.6.22-tuxrx:tpl-branch
> 
> * refs/heads/tpl-branch: fast forward to branch 'onstor-2.6.22-tuxrx' of
> /homes/andys/src/tuxrx/linux/kernel/linux-mips-2.6
>     old..new: bea1b71..e3c8890
> 
> Warning: fetch updated the current branch head.
> Warning: fast forwarding your working tree from
> Warning: commit bea1b71fb6d9f61ceccf9ac7a187b60c658450c6.
> arch/mips/onstor/tuxrx/prom.c: needs update
> arch/mips/onstor/tuxrx/setup.c: needs update
> arch/mips/pci/fixup-tuxrx.c: needs update
> drivers/char/mem.c: needs update
> drivers/mgmt-bus/mgmt-bus.c: needs update
> drivers/mgmt-bus/mgmt-bus.h: needs update
> drivers/mgmt-bus/rcon.c: needs update
> drivers/mgmt-bus/tuxrx_mgmt_bus.c: needs update
> include/asm-mips/mach-cougar/cougar.h: needs update
> include/asm-mips/mach-tuxrx/tuxrx.h: needs update
> include/linux/skbuff.h: needs update
> include/net/sock.h: needs update
> net/tpl/pkt-queue-struct.h: needs update
> net/tpl/pkt.c: needs update
> fatal: Entry 'arch/mips/onstor/tuxrx/prom.c' not uptodate. Cannot merge.
> Cannot fast-forward your working tree.
> After making sure that you saved anything precious from
> $ git diff bea1b71fb6d9f61ceccf9ac7a187b60c658450c6
> output, run
> $ git reset --hard
> to recover.
> 
> 
> ===========================
> 
> bfisher-linux: 5012>git status
> # On branch tpl-branch
> # Changes to be committed:
> #   (use "git reset HEAD <file>..." to unstage)
> #
> #       modified:   arch/mips/Kconfig
> #       modified:   arch/mips/configs/ip27_defconfig
> #       modified:   arch/mips/kernel/setup.c
> #       modified:   arch/mips/lib/memcpy-inatomic.S
> #       modified:   arch/mips/lib/memcpy.S
> #       modified:   arch/mips/onstor/Kconfig
> #       modified:   arch/mips/onstor/cougar/prom.c
> #       modified:   arch/mips/onstor/tuxrx/prom.c
> #       modified:   arch/mips/onstor/tuxrx/setup.c
> #       modified:   arch/mips/pci/fixup-tuxrx.c
> #       modified:   drivers/Kconfig
> #       modified:   drivers/char/mem.c
> #       modified:   drivers/char/watchdog/sb_wdog.c
> #       modified:   drivers/mgmt-bus/mgmt-bus.c
> #       modified:   drivers/mgmt-bus/mgmt-bus.h
> #       modified:   drivers/net/sb1250-mac.c
> #       modified:   drivers/ssc-mgmt-bus/cougar_mgmt_bus.c
> #       modified:   drivers/ssc-mgmt-bus/mgmt-bus.c
> #       modified:   include/asm-mips/mach-cougar/cougar.h
> #       modified:   include/asm-mips/mach-tuxrx/tuxrx.h
> #       modified:   include/linux/netdevice.h
> #       modified:   net/Kconfig
> #       modified:   net/Makefile
> #       deleted:    net/onstor/Makefile
> #       deleted:    net/onstor/acpu.c
> #       modified:   tuxrx-config
> #
> # Changed but not updated:
> #   (use "git add <file>..." to update what will be committed)
> #
> #       modified:   arch/mips/onstor/tuxrx/prom.c
> #       modified:   drivers/ssc-mgmt-bus/mgmt-bus.c
> #       modified:   include/linux/skbuff.h
> #       modified:   include/net/sock.h
> #       modified:   net/tpl/pkt-queue-struct.h
> #       modified:   net/tpl/pkt.c
> #
> # Untracked files:
> #   (use "git add <file>..." to include in what will be committed)
> #
> #       .config
> #       .config~
> #       .missing-syscalls.d
> #       andy-sharedmem.patch.eml
> #       arch/mips/onstor/cougar/prom.c.orig
> #       arch/mips/onstor/cougar/prom.c~
> #       arch/mips/onstor/tuxrx/cougar_bm_fpga.h
> #       arch/mips/onstor/tuxrx/prom.c.orig
> #       arch/mips/onstor/tuxrx/prom.c~
> #       arch/mips/onstor/tuxrx/setup.c.orig
> #       arch/mips/onstor/tuxrx/setup.c~
> #       arch/mips/pci/fixup-tuxrx.c~
> #       config_tuxrx
> #       drivers/char/mem.c~
> #       drivers/mgmt-bus/ecc-failure.txt
> #       drivers/mgmt-bus/mgmt-bus.c.new
> #       drivers/mgmt-bus/mgmt-bus.c~
> #       drivers/mgmt-bus/mgmt-bus.h~
> #       drivers/mgmt-bus/prom.c.new
> #       drivers/mgmt-bus/rcon.c.fisher
> #       drivers/mgmt-bus/rcon.c~
> #       drivers/mgmt-bus/tuxrx_mgmt_bus.c~
> #       drivers/ssc-mgmt-bus/#mgmt-bus.c#
> #       drivers/ssc-mgmt-bus/mgmt-bus.c~
> #       include/asm-mips/mach-cougar/cougar.h~
> #       include/asm-mips/mach-tuxrx/cougar.h
> #       include/asm-mips/mach-tuxrx/tuxrx.h~
> #       include/linux/skbuff.h.fisher
> #       include/linux/skbuff.h~
> #       include/net/sock.h.fisher
> #       include/net/sock.h~
> #       mlog
> #       mlog.ssc
> #       net/tpl/#pkt.h#
> #       net/tpl/#tpl-api.h#
> #       net/tpl/pkt-queue-struct.h~
> #       net/tpl/pkt.c~
> #       tree-diff-mgmt.patch
> bfisher-linux: 5013>
> 
