From: Jan Kara <jack@suse.cz>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: LKML <linux-kernel@vger.kernel.org>
Subject: Rebased for_next branch in my linux-fs git tree
Date: Thu, 4 Jul 2013 19:43:04 +0200 [thread overview]
Message-ID: <20130704174304.GA30265@quack.suse.cz> (raw)
Hello Stephen,
I'm just writing this to let you know that I had to rebase for_next
branch in my linux-fs git tree because I've messed up my tree and for_linus
& for_next branches contained the same patches but with different commit
IDs (fast track fixes). When I pulled for_next into for_linus branch,
the changelog had commit logs for those patches twice which was rather
confusing. The only solution I found was to rebase for_next on top of
for_linus to get rid of the duplicate patches. If there's a cleaner
solution of the situation, I'm happy to learn it for future...
This is just that you know what's going on when you are doing your merge
window statistics :).
Honza
--
Jan Kara <jack@suse.cz>
SUSE Labs, CR
next reply other threads:[~2013-07-04 17:43 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-04 17:43 Jan Kara [this message]
2013-07-05 0:04 ` Rebased for_next branch in my linux-fs git tree Stephen Rothwell
2013-07-05 2:57 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130704174304.GA30265@quack.suse.cz \
--to=jack@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox