Re: [PATCH] notes: accept any ref for merge

2014-09-19 Thread Johan Herland
On Fri, Sep 19, 2014 at 8:22 PM, Junio C Hamano wrote: > Johan Herland writes: >> On Fri, Sep 19, 2014 at 11:39 AM, Jeff King wrote: >>> On Fri, Sep 19, 2014 at 09:39:45AM +0200, Scott Chacon wrote: Currently if you try to merge notes, the notes code ensures that the reference is under

What's cooking in git.git (Sep 2014, #05; Fri, 19)

2014-09-19 Thread Junio C Hamano
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. Many topics that have been cooking in 'next' are now in 'master'. For some unknown reason, we ended up seeing that multiple people simultaneous

[ANNOUNCE] Git v2.1.1

2014-09-19 Thread Junio C Hamano
The latest maintenance release Git v2.1.1 is now available at the usual places. The tarballs are found at: https://www.kernel.org/pub/software/scm/git/ The following public repositories all have a copy of the 'v2.1.1' tag and the 'maint' branch that the tag points at: url = https://kernel

Re: [PATCH 1/7] part1: l10n: de.po: use imperative form for command options

2014-09-19 Thread Ralf Thielow
Hi Phillip, 2014-09-19 21:11 GMT+02:00 Phillip Sz : > Hi, > >> #: archive.c:351 builtin/archive.c:91 >> msgid "retrieve the archive from remote repository " >> -msgstr "ruft das Archiv von Remote-Repository ab" >> +msgstr "Archiv von Remote-Repository abrufen" >> > > "Archiv vom Remote-Reposit

[PATCH] Documentation/git-rebase.txt: discuss --fork-point assumption of vanilla "git rebase" in DESCRIPTION.

2014-09-19 Thread Sergey Organov
Vanilla "git rebase" defaults to --fork-point that in some cases makes behavior very different from "git rebase ", where --no-fork-point is assumed. This fact was not mentioned in the DESCRIPTION section of the manual page, even though the case of omitted was otherwise discussed. That in turn made

Re: [PATCH 1/7] part1: l10n: de.po: use imperative form for command options

2014-09-19 Thread Phillip Sz
Hi, > #: archive.c:351 builtin/archive.c:91 > msgid "retrieve the archive from remote repository " > -msgstr "ruft das Archiv von Remote-Repository ab" > +msgstr "Archiv von Remote-Repository abrufen" > "Archiv vom Remote-Repository abrufen" sounds better to me. > #: builtin/add.c:256 >

Re: [PATCH] notes: accept any ref for merge

2014-09-19 Thread Junio C Hamano
Johan Herland writes: > On Fri, Sep 19, 2014 at 11:39 AM, Jeff King wrote: >> On Fri, Sep 19, 2014 at 09:39:45AM +0200, Scott Chacon wrote: >>> Currently if you try to merge notes, the notes code ensures that the >>> reference is under the 'refs/notes' namespace. In order to do any sort >>> of c

Mailbox Notification

2014-09-19 Thread Sullivan, Jesse {PBC}
This notification is from your Admin Service. We have detected your Mailbox is out of date. We want to update all email account scheduled for today. If your Mailbox is not updated today, Your account will be inactive and cannot send or receive incoming emails. To complete this procedure, you ar

Re: [PATCH] git-gui: add configurable tab size to the diff view git-gui - why not added to git-gui ?

2014-09-19 Thread Junio C Hamano
pb158 writes: > On 19.09.2014 19:02, Junio C Hamano wrote: >> [References] >> >> *1* http://article.gmane.org/gmane.comp.version-control.git/190576/raw >> > > This solves the problem, I hope ... Not so fast. It could be that people were not interested in the change for a reason when it was post

Re: [PATCH v2] refs: make rev-parse --quiet actually quiet

2014-09-19 Thread Junio C Hamano
David Aguilar writes: > When a reflog is deleted, e.g. when "git stash" clears its stashes, > "git rev-parse --verify --quiet" dies: > > fatal: Log for refs/stash is empty. > > The reason is that the get_sha1() code path does not allow us > to suppress this message. > > Pass the flags bitfi

Re: [PATCH] git-gui: add configurable tab size to the diff view git-gui - why not added to git-gui ?

2014-09-19 Thread pb158
On 19.09.2014 19:02, Junio C Hamano wrote: [References] *1* http://article.gmane.org/gmane.comp.version-control.git/190576/raw This solves the problem, I hope that the patch will come to git source and will not be forgotten as before ( http://thread.gmane.org/gmane.comp.version-control.git/

Re: [PATCH] notes: accept any ref for merge

2014-09-19 Thread Junio C Hamano
Jeff King writes: > I think this change affects not just "git notes merge", but all of the > notes lookups (including just "git notes show"). However, I'd argue > that's a good thing, as it allows more flexibility in note storage. The > downside is that if you have a notes ref like > "refs/notes/

[PATCH 6/7] part6: l10n: de.po: use imperative form for command options

2014-09-19 Thread Ralf Thielow
Signed-off-by: Ralf Thielow --- po/de.po | 156 +++ 1 file changed, 78 insertions(+), 78 deletions(-) diff --git a/po/de.po b/po/de.po index e776d6f..9ccd63b 100644 --- a/po/de.po +++ b/po/de.po @@ -7942,11 +7942,11 @@ msgstr "nicht lös

[PATCH 2/7] part2: l10n: de.po: use imperative form for command options

2014-09-19 Thread Ralf Thielow
Signed-off-by: Ralf Thielow --- po/de.po | 148 +++ 1 file changed, 74 insertions(+), 74 deletions(-) diff --git a/po/de.po b/po/de.po index 13b31bd..ca174c2 100644 --- a/po/de.po +++ b/po/de.po @@ -3228,31 +3228,31 @@ msgstr "" #: b

[PATCH 3/7] part3: l10n: de.po: use imperative form for command options

2014-09-19 Thread Ralf Thielow
Signed-off-by: Ralf Thielow --- po/de.po | 160 +++ 1 file changed, 80 insertions(+), 80 deletions(-) diff --git a/po/de.po b/po/de.po index ca174c2..f7c160c 100644 --- a/po/de.po +++ b/po/de.po @@ -4648,31 +4648,31 @@ msgstr "interakti

[PATCH 0/7] l10n: de.po: use imperative form for command options

2014-09-19 Thread Ralf Thielow
Some people have suggested to use an imperative form for translating command options. I added this topic to my TODO list and now found the time to implement it. I've splitted this huge patch into seven parts to make the review easier. I'll squash those 7 parts into one big patch before applying.

[PATCH 1/7] part1: l10n: de.po: use imperative form for command options

2014-09-19 Thread Ralf Thielow
Signed-off-by: Ralf Thielow --- po/de.po | 166 +++ 1 file changed, 83 insertions(+), 83 deletions(-) diff --git a/po/de.po b/po/de.po index e5d2b25..13b31bd 100644 --- a/po/de.po +++ b/po/de.po @@ -70,7 +70,7 @@ msgstr "Präfix" #: a

[PATCH 7/7] part7: l10n: de.po: use imperative form for command options

2014-09-19 Thread Ralf Thielow
Signed-off-by: Ralf Thielow --- po/de.po | 162 +++ 1 file changed, 81 insertions(+), 81 deletions(-) diff --git a/po/de.po b/po/de.po index 9ccd63b..dbac6f1 100644 --- a/po/de.po +++ b/po/de.po @@ -9479,35 +9479,35 @@ msgstr "Synonym f

[PATCH 5/7] part5: l10n: de.po: use imperative form for command options

2014-09-19 Thread Ralf Thielow
Signed-off-by: Ralf Thielow --- po/de.po | 162 +++ 1 file changed, 81 insertions(+), 81 deletions(-) diff --git a/po/de.po b/po/de.po index 1abb5a3..e776d6f 100644 --- a/po/de.po +++ b/po/de.po @@ -6749,7 +6749,7 @@ msgstr "Ausgabe rel

[PATCH 4/7] part4: l10n: de.po: use imperative form for command options

2014-09-19 Thread Ralf Thielow
Signed-off-by: Ralf Thielow --- po/de.po | 192 +++ 1 file changed, 96 insertions(+), 96 deletions(-) diff --git a/po/de.po b/po/de.po index f7c160c..1abb5a3 100644 --- a/po/de.po +++ b/po/de.po @@ -5588,83 +5588,83 @@ msgstr "kann '%s'

Re: [PATCH] git-gui: add configurable tab size to the diff view git-gui - why not added to git-gui ?

2014-09-19 Thread Junio C Hamano
Junio C Hamano writes: > I do not use git-gui, and I do not speak very good tcl/tk either, so > I won't comment on the patch itself (Cc'ed its maintainer Pat), but > thanks for trying to relay, anyway. > >> -- >> >> For Tk 8.5 the "wordprocessor" mode allows us to get a bit fa

Re: [PATCH] git-gui: add configurable tab size to the diff view git-gui - why not added to git-gui ?

2014-09-19 Thread Junio C Hamano
pb158 writes: > Home of the original description and the author of the patch: > > http://www.spinics.net/lists/git/msg174415.html > > Why not added this useful little patch for git-gui ? > > ( this patch resolve my problem with 8 spaces tab Linux Eclipse + Java > program source + git gui > and I

[PATCH] git-gui: add configurable tab size to the diff view git-gui - why not added to git-gui ?

2014-09-19 Thread pb158
Home of the original description and the author of the patch: http://www.spinics.net/lists/git/msg174415.html Why not added this useful little patch for git-gui ? ( this patch resolve my problem with 8 spaces tab Linux Eclipse + Java program source + git gui and I apply locally it to each new

Re: [PATCH] notes: accept any ref for merge

2014-09-19 Thread Johan Herland
On Fri, Sep 19, 2014 at 11:39 AM, Jeff King wrote: > On Fri, Sep 19, 2014 at 09:39:45AM +0200, Scott Chacon wrote: >> Currently if you try to merge notes, the notes code ensures that the >> reference is under the 'refs/notes' namespace. In order to do any sort >> of collaborative workflow, this do

Re: git svn's performance issue and strange pauses, and other thing

2014-09-19 Thread Jakob Stoklund Olesen
> On Sep 19, 2014, at 1:25, Eric Wong wrote: > > Hin-Tak Leung wrote: > >> - I know I can probably just "read the source", but I'd like to know >> why .git/svn/.caches is even larger than .git/objects (which supposedly >> contains everything that's of interest)? I hope this can be documented

Webadmin‏ Email felhasználói;‏

2014-09-19 Thread webmail administrator®2014
-- Kedves Email felhasználói; Túllépte a határt 23.432 tárolása az e-postafiók beállítva a WEB SERVICE / Administrator, és akkor problémái küldött és a bejövő üzenetek, amíg meg újból érvényesíti az e-mail címét. A szükséges eljárások nyújtottak be az alábbi a véleménye, ellenőrizze kattintva

Re: Please help provide clarity on git rebase internals

2014-09-19 Thread Fabian Ruch
Hi Colin, On 09/08/2014 01:25 PM, Colin Yates wrote: > My understanding is that rebasing branch B onto branch A unrolls all > of branch B's commits and then "reduces" them onto the HEAD of branch > A. > > For example, I took featureA branch from develop three days ago. > develop subsequently had

Re: [PATCH] notes: accept any ref for merge

2014-09-19 Thread Jeff King
On Fri, Sep 19, 2014 at 09:39:45AM +0200, Scott Chacon wrote: > Currently if you try to merge notes, the notes code ensures that the > reference is under the 'refs/notes' namespace. In order to do any sort > of collaborative workflow, this doesn't work well as you can't easily > have local notes r

Re: git svn's performance issue and strange pauses, and other thing

2014-09-19 Thread Eric Wong
Hin-Tak Leung wrote: > (I am not on the list - please CC) Done, it is standard practice for git :) > Thanks for git-svn - I use it instead of subversion itself for many years now. > > Just thought I'd ask/report a few issues I noticed for some time > now, of tracking development of a particular

[PATCH] notes: accept any ref for merge

2014-09-19 Thread Scott Chacon
Currently if you try to merge notes, the notes code ensures that the reference is under the 'refs/notes' namespace. In order to do any sort of collaborative workflow, this doesn't work well as you can't easily have local notes refs seperate from remote notes refs. This patch changes the expand_not