Messages in this thread | | | Date | Sat, 4 Aug 2012 09:19:07 +0100 | From | Al Viro <> | Subject | Re: Linux 3.6-rc1 |
| |
On Sat, Aug 04, 2012 at 03:51:01PM +0800, Dongsheng Song wrote: > On Sat, Aug 4, 2012 at 2:19 PM, Al Viro <viro@zeniv.linux.org.uk> wrote: > > > > Documentation/sysctl/vm.txt.rej | 21 +++++++++++++ > > vm.txt.rej ???
Grrr... git add Documentation/sysctl/ during conflict-resolving in git am, having forgotten that this turd wasn't removed in process, then a bit of blindness when generating and pasting the diffstat ;-/ Thanks for spotting.
I've put the branch sans that idiocy in the same tree; for-linus-2 (basically, branched off at the commit introducing that, then git rm Documentation/sysctl/*.rej to get rid of that sucker, git commit --amend, git cherry-pick <branchpoint>..for-linus)
Same shortlog, same diffstat sans that idiocy... Alternatively, it could be fixed up upon merge, if Linus is really dead set against any rebases (same git rm/git commit --amend right after git merge or git pull, whatever Linus uses).
Sorry about that ;-/
| |