Dear diary, on Tue, Apr 19, 2005 at 07:35:15PM CEST, I got a letter where Steven Cole <[EMAIL PROTECTED]> told me that... > Example: ..snip a perfect-looking example.. > --------- > Speaking of 'git diff', I ran that before applying the following patch, > and got a diff starting thusly: > > --- /dev/null > +++ b/gitmerge-file.sh > > I had earlier done a 'git pull pasky', which was 'Up to date'.
Check/prune your add/rm-queue. > So, the following patch is a conventional diff. > > If the Perl filename or code is too hideous, you're more than > welcome to change it. I'd actually prefer to just throw the whole help command handling to githelp.pl. I dislike helper scripts if I can avoid them. ;-) -- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html