5:46 p.m.
On Mon, 23 Jul 2012 22:31:17 +0100, Commit Mailer wibbled on for an age:
commitdiff
http://git.netsurf-browser.org/netsurf.git/commitdiff/773cbd2aea9e0dd1375...
commit 773cbd2aea9e0dd1375f1619d1938b625e00d85b
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Update of Italian strings (credit: Samir Hawamdeh)
diff --git a/resources/FatMessages b/resources/FatMessages
Right, I'm officially confused now as it definitely said I didn't have
permission ("ruleset denied access" and lots of "[rejected]" next to
the branches - but not master, curiously)
I'm on master branch and it clearly hasn't updated locally. The
website shows the diffs but the blob still contains "Disegna" instead
of "Draw", so... *shrug*
Chris
5:56 p.m.
New subject: netsurf: branch master updated. 0bbe65de26180079f70de0d7f4b6ee1eaaf54293
On 23 Jul 2012 22:46:53 +0100, Chris Young wrote:
On Mon, 23 Jul 2012 22:31:17 +0100, Commit Mailer wibbled on for an
age:
> commitdiff
http://git.netsurf-browser.org/netsurf.git/commitdiff/773cbd2aea9e0dd1375...
> commit 773cbd2aea9e0dd1375f1619d1938b625e00d85b
> Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
> Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
>
> Update of Italian strings (credit: Samir Hawamdeh)
>
> diff --git a/resources/FatMessages b/resources/FatMessages
Right, I'm officially confused now as it definitely said I didn't have
permission ("ruleset denied access" and lots of "[rejected]" next to
the branches - but not master, curiously)
I'm on master branch and it clearly hasn't updated locally. The
website shows the diffs but the blob still contains "Disegna" instead
of "Draw", so... *shrug*
Hold on... maybe it did update, there is still a "Disegna" present in
the new file, which I think should be a "Draw". I was looking at the
wrong line.
Not sure why it rejected it for the branches, although it shouldn't
have been applying it to those anyway.
Chris
3:28 a.m.
New subject: netsurf: branch master updated. 0bbe65de26180079f70de0d7f4b6ee1eaaf54293
On Mon, Jul 23, 2012 at 10:46:53PM +0100, Chris Young wrote:
Right, I'm officially confused now as it definitely said I
didn't have
permission ("ruleset denied access" and lots of "[rejected]" next to
the branches - but not master, curiously)
Git's default behaviour when you say 'git push' is to try and push *all*
local
branches which match the name an existing remote branch. As such, an unadorned
'git push' will try and push every single branch which might match and you'll
get a [rejected] next to any refs which fail to push (e.g. because they're a
rebase or behind or similar).
You can alter it so that an unadorned 'git push' only pushes your current
branch towards its upstream by running:
git config --global push.default upstream
Personally I always set that on my dev machines because it makes more sense to
me.
D.
--
Daniel Silverstone http://www.netsurf-browser.org/
PGP mail accepted and encouraged. Key Id: 3CCE BABE 206C 3B69
3:34 a.m.
New subject: netsurf: branch master updated. 0bbe65de26180079f70de0d7f4b6ee1eaaf54293
On Tue, 24 Jul 2012 08:28:03 +0100, Daniel Silverstone wrote:
You can alter it so that an unadorned 'git push' only pushes
your current
branch towards its upstream by running:
git config --global push.default upstream
Personally I always set that on my dev machines because it makes more sense to
me.
Excellent, I'll set that, thanks.
Perhaps this needs to be on the wiki page too?
Chris
3:36 a.m.
New subject: netsurf: branch master updated. 0bbe65de26180079f70de0d7f4b6ee1eaaf54293
On Tue, Jul 24, 2012 at 08:34:09AM +0100, Chris Young wrote:
> You can alter it so that an unadorned 'git push' only
pushes your current
> branch towards its upstream by running:
>
> git config --global push.default upstream
>
> Personally I always set that on my dev machines because it makes more sense to
> me.
Excellent, I'll set that, thanks.
Perhaps this needs to be on the wiki page too?
If it fixes your problem, then put it on the wiki along with a note about what
it solves, so that if others encounter the issue they will be able to find the
solution.
D.
--
Daniel Silverstone http://www.netsurf-browser.org/
PGP mail accepted and encouraged. Key Id: 3CCE BABE 206C 3B69
3964
days inactive
3965
days old
netsurf-dev@netsurf-browser.org
4 comments
2 participants
participants (2)
-
Chris Young -
Daniel Silverstone