Re: [GIT PULL] tracing: Updates for 4.4

From	Steven Rostedt <rostedt@goodmis.org>
Newsgroups	linux.kernel
Subject	Re: [GIT PULL] tracing: Updates for 4.4
Date	2015-11-07 00:10 +0100
Message-ID	<qrYiR-2De-7@gated-at.bofh.it> (permalink)
References	<qrQ1Y-5z3-7@gated-at.bofh.it> <qrWTM-1C2-7@gated-at.bofh.it> <qrXmO-21f-17@gated-at.bofh.it> <qrXwu-25P-5@gated-at.bofh.it> <qrY9c-2ke-3@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

On Fri, 6 Nov 2015 17:52:06 -0500
Steven Rostedt <rostedt@goodmis.org> wrote:

> I'll have to add something to my scripts that pulls in any merge
> breakage, such that when I run the scripts to generate the pull
> request, it adds them in automatically. Because obviously, the manual
> approach isn't working for me.

I updated my scripts such that if I add a 'notes' file in the repo that
I'm pushing, it will include that into the pull request. Now if there's
a conflict like this again, I can add a comment about it in the notes
file and it will be included in my next pull request.

I just need to remember to delete it after I'm done ;-)

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

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

Thread

Re: [GIT PULL] tracing: Updates for 4.4 Linus Torvalds <torvalds@linux-foundation.org> - 2015-11-06 22:40 +0100
  Re: [GIT PULL] tracing: Updates for 4.4 Stephen Rothwell <sfr@canb.auug.org.au> - 2015-11-06 23:10 +0100
    Re: [GIT PULL] tracing: Updates for 4.4 Linus Torvalds <torvalds@linux-foundation.org> - 2015-11-06 23:20 +0100
      Re: [GIT PULL] tracing: Updates for 4.4 Steven Rostedt <rostedt@goodmis.org> - 2015-11-07 00:00 +0100
        Re: [GIT PULL] tracing: Updates for 4.4 Steven Rostedt <rostedt@goodmis.org> - 2015-11-07 00:10 +0100

csiph-web