On 21.08.2017 22:31, Jean-Marc Lasgouttes wrote:
Le 21/08/2017 à 14:54, racoon a écrit :
I manually applied the second patch now. There was a missing line in
your patch ...
- // fall through
Sorry for the inconvenience. I don't know how the comment got missing.
The was changed recently by Juergen. You should update your tree
(equivalent to a "git pull") and your commit will be updated against the
latest master (if everything goes right :).
Thanks! I did a "git pull -- rebase" on the master. But it seems neither
to affect the branch I created for the table fixes, nor the patches I
create relative to master.
When I do a "git pull" on my branch I get the following message:
"There is no tracking information for the current branch.
Please specify which branch you want to rebase against.
See git-pull(1) for details.
git pull <remote> <branch>
If you wish to set tracking information for this branch you can do so with:
git branch --set-upstream-to=origin/<branch> SomeTableFixes"
So what is the right command here?
Daniel
