On Thu, Feb 25, 2016 at 02:45:04PM -0800, Christopher Allan Webber wrote: > Danny Milosavljevic writes: > > > Hi, > > > > first, thanks for the review and test and commit. > > > > On Thu, 25 Feb 2016 09:53:17 -0800 > > Christopher Allan Webber <cweb...@dustycloud.org> wrote: > > > >> This looks ready to go, though it still lacks a changelog style commit > >> message, > > > > I committed it locally, with a commit message... *shrugs*. > > I think git format-patch put the message into the subject. > > Should I manually write a changelog-style blurb, too? > > > >>and it isn't formatted with git format-patch. > > > > Huh? After the local commit I called git format-patch to format it and the > > mail with the patch was created from its output. > > > > btw: Now git pull merges every time I pull... hmmmmm... > > If you committed your own patch to master, that's not the same as what > will be applied upstream. I failed to push earlier today (someone else > had), but it's actually up now. If you ensure that your commit is > actually upstream (check the logs) and you're on master you can do: > > git reset --hard origin/master
This will discard any other work you've done on the master branch. I would do `git diff HEAD..origin/master` to see what the difference is.
