Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1623965

Re: git process question

From Linus Torvalds <torvalds@linux-foundation.org>
Newsgroups linux.kernel
Subject Re: git process question
Date 2017-04-15 02:10 +0200
Message-ID <twjrP-7WC-5@gated-at.bofh.it> (permalink)
References <twhzI-6JW-13@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


On Fri, Apr 14, 2017 at 3:05 PM, Steven Rostedt <rostedt@goodmis.org> wrote:
>
> Would it be OK to cherry pick this change that I send to you, which
> will be based on a commit in your tree, into my development branch
> where I can continue the work on top of the previous development that's
> in linux-next and the fix?

Yes, the occasional duplicated commit due to real reasons is fine. I
get worried if people start using cherry-picking and rebasing as a
_process_, but if the process generally works, and then there's an
occasional need to fix something like this, that's perfectly fine.

          Linus

Back to linux.kernel | Previous | NextPrevious in thread | Next in thread | Find similar | Unroll thread


Thread

git process question Steven Rostedt <rostedt@goodmis.org> - 2017-04-15 00:10 +0200
  Re: git process question Steven Rostedt <rostedt@goodmis.org> - 2017-04-15 02:10 +0200
  Re: git process question Linus Torvalds <torvalds@linux-foundation.org> - 2017-04-15 02:10 +0200
  Re: git process question Michael Ellerman <mpe@ellerman.id.au> - 2017-04-19 12:50 +0200
    Re: git process question Linus Torvalds <torvalds@linux-foundation.org> - 2017-04-20 01:10 +0200

csiph-web