2017-11-22 19:02:48

by Palmer Dabbelt

[permalink] [raw]
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.

From 1585254702050699714@xxx Mon Nov 27 21:04:54 +0000 2017
X-GM-THRID: 1585254702050699714
X-Gmail-Labels: Inbox,Category Forums,HistoricalUnread