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-next>] [day] [month] [year] [list]
Message-ID: <mhng-99ec53b8-be79-4eb8-90fe-fe2ef0b6cafb@palmer-si-x1c4>
Date:   Wed, 22 Nov 2017 11:01:57 -0800 (PST)
From:   Palmer Dabbelt <palmer@...ive.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
CC:     linux-kernel@...r.kernel.org
Subject: "git reset --hard" on riscv for-linux-next branch

Is it OK to rewrite history on my for-linux-next branch?  Since we got upstream 
I've started getting patches from various people and as a result I now have a 
bunch of branches with independent commits on them.  In an ideal world I'd like to 
do something like

  git checkout for-linux-next
  git reset --hard torvalds/master # or maybe the latest tag?
  for branch in $(list-staging-branches-for-linux-next)
  do
    git merge $branch
  done
  git push --force palmer for-linux-next

Is that an OK thing to do regularly in the branch I give to you?  I can find a 
bunch of information on how to use linux-next, but not for people in it.

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ