linux-kernel - Re: My kernel hangs again: Help with git please

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20070617105226.GA22912@steel.home>
Date:	Sun, 17 Jun 2007 12:52:27 +0200
From:	Alex Riesen <raa.lkml@...il.com>
To:	Carlo Wood <carlo@...noe.com>,
	Daniel Barkalow <barkalow@...ervon.org>,
	linux-kernel@...r.kernel.org
Subject: Re: My kernel hangs again: Help with git please

Carlo Wood, Sat, Jun 16, 2007 16:03:40 +0200:
> $ git merge origin
> fatal: Needed a single revision
> Usage: /usr/bin/git-merge [-n] [--no-commit] [--squash] [-s <strategy>]... <merge-message> <head> <remote>+
> 
> For some reason I don't think I should be needing commands that need
> "<merge-message>"; I don't want to change the (local) tree in anyway.

I'd recommend to upgrade your git. There are some really nice
improvements in the latest versions (1.5.2.2, for instance).
Particularly, the command above would have worked. That is, assuming
you actually do have that origin branch. In any case, a

    $ git fetch git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git master
    $ git reset --hard FETCH_HEAD

will get you the very latest kernel in your working directory. Has
some disadvantages, though: does not retrieve the tags and destroys
local changes.

But you'll find a man page of git-remote and git-config very
interesting, especially wrt the above operation. I do just "git pull",
for example and actually _am_ sure I get the latest kernel, get all
the tags and never loose local changes.

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/