documentation: fix almost duplicate filenames (io/IO-mapping.txt)
in [Kernel]
|
Prev: [tip:x86/cpu] x86, cpu: Split addon_cpuid_features.c
Next: linux-next: manual merge of the net tree with the net-current tree
From: Linus Torvalds on 19 Jul 2010 22:30 On Mon, Jul 19, 2010 at 6:12 PM, Randy Dunlap <randy.dunlap(a)oracle.com> wrote: > > (hopefully I got this right. �I'm not a big git user.) Hmm. No. The commit otherwise looks correct, but the commit message is buggered. The first line of the message is From: Randy Dunlap <randy.dunlap(a)oracle.com> rather than the subject of the patch itself. No fear. Practice makes perfect. Just try again ;) Linus -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Linus Torvalds on 20 Jul 2010 11:10 On Mon, Jul 19, 2010 at 11:59 PM, Borislav Petkov <bp(a)alien8.de> wrote: >> >> Will do... but how do I edit the commit message? > > git commit --amend > > after you've made sure that the commit you want to edit is at the tip of > the current branch. ... and if it's not at the top (like it is this time), do "man git-rebase" and then you can use "git rebase -i origin" (where "origin" is whatever your upstream is). And yeah, this is not something you really should do to anything you've published, but you'll know better next time and fix it all up _before_ you publish it and ask me to pull ;) Linus -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Linus Torvalds on 20 Jul 2010 12:10
On Tue, Jul 20, 2010 at 8:39 AM, Randy Dunlap <randy.dunlap(a)oracle.com> wrote: > > � �Subject: documentation: fix almost duplicate filenames (IO/io-mapping.txt) > � �From: Randy Dunlap <randy.dunlap(a)oracle.com> This is still wrong. The commit message should not have email headers, and it shouldn't have a From: in it. The authorship (and committer) information is separate to the message, so the message _should_ look just something like: documentation: fix almost duplicate filenames (IO/io-mapping.txt) � �Having both IO-mapping.txt and io-mapping.txt in Documentation/ � �was confusing and/or bothersome to some people, so rename � �IO-mapping.txt to bus-virt-phys-mapping.txt. �Also update � �Documentation/00-INDEX for both of these files. � �Signed-off-by: Randy Dunlap <randy.dunlap(a)oracle.com> and nothing else. Try using "gitk" on your tree, you'll see how it looks. The first line is always used as a summary of the whole thing, which is why you want a single line that describes the thing, and then an empty line, followed by the more complete description. The "From: " and "Subject: " lines are just for _emails_ - various git tools will take an email, and use that email to fill in the commit information correctly (ie the "Subject:" line of an email becomes that first summary line, and the "From:" line becomes authorship). But when you edit the messages directly, don't use those things. (If you want to set author information that isn't yourself, you'd use 'git commit --author="xyz <xyz(a)example.com>"' etc, but normally you'd never need that, since normally if you do "git commit" you're obviously committing your own work). Linus Linus -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |