[PATCH] notes: accept any ref for merge
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_notes_ref function to check for simply a
leading refs/ instead of refs/notes to check if we're being passed an
expanded notes reference. This would allow us to set up
refs/remotes-notes or otherwise keep mergeable notes references outside
of what would be contained in the notes push refspec.
Signed-off-by: Scott Chacon scha...@gmail.com
---
notes.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/notes.c b/notes.c
index 5fe691d..78d58af 100644
--- a/notes.c
+++ b/notes.c
@@ -1293,7 +1293,7 @@ int copy_note(struct notes_tree *t,
void expand_notes_ref(struct strbuf *sb)
{
- if (starts_with(sb-buf, refs/notes/))
+ if (starts_with(sb-buf, refs/))
return; /* we're happy */
else if (starts_with(sb-buf, notes/))
strbuf_insert(sb, 0, refs/, 5);
--
2.0.0
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: git svn's performance issue and strange pauses, and other thing
Hin-Tak Leung ht...@users.sourceforge.net 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 subversion-based development project. Broadly speaking, I think there are 3 problems, especially noticeable against a particular repository, but to a lesser extent with some others too. - just doing git svn fetch --all seems to consume a lot of memory, for very little actual fetched changes. (in the 2GB+ region, sometimes). - git svn fetch --all also seems to take a long time too, for certain fetched changes. (in the minutes region). Jakob sent some patches a few months ago which seem to address the issue. Unfortunately we forgot about them :x Can you take a look at the following two mergeinfo-speedups in my repo? (git://bogomips.org/git-svn) Jakob Stoklund Olesen (2): git-svn: only look at the new parts of svn:mergeinfo git-svn: only look at the root path for svn:mergeinfo Also downloadable here: http://bogomips.org/git-svn.git/patch?id=9b258e721b30785357535 http://bogomips.org/git-svn.git/patch?id=73409a2145e93b436d74a Can you please give them a try? - 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 towards the end of the man-page, for example, of important parts of .git/svn (and what not to do with them...), without needing to 'read the source'. Here is part of du from a couple of days ago: 254816.git/objects 307056.git/svn/.caches 332452.git/svn 588064.git The actual .git/config is here - this should be sufficient info for somebody looking into experiencing the issues I mentioned above. IIRC, the caching is unique to mergeinfo, so perhaps Jakob's patches help, there, too. Sorry I don't understand the mergeinfo stuff more, I've never worked on a project which uses it. $ more .git/config [core] repositoryformatversion = 0 filemode = true bare = false logallrefupdates = true [svn-remote svn] url = https://svn.r-project.org/R fetch = trunk:refs/remotes/trunk branches = branches/*:refs/remotes/* tags = tags/*:refs/remotes/tags/* [pack] threads = 1 -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] notes: accept any ref for merge
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 refs seperate from remote notes refs. This patch changes the expand_notes_ref function to check for simply a leading refs/ instead of refs/notes to check if we're being passed an expanded notes reference. This would allow us to set up refs/remotes-notes or otherwise keep mergeable notes references outside of what would be contained in the notes push refspec. 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/refs/heads/master, you can no longer refer to it as refs/heads/master (you have to use the fully qualified name to get the note). But: 1. This makes the notes resolution a lot more like regular ref resolution (i.e., we now allow fully qualified refs, and you can store remote notes outside of refs/notes if you want to). 2. There are already a bunch of names that have the same problem. You cannot refer to refs/notes/notes/foo as notes/foo, nor refs/notes/refs/notes/foo as refs/notes/foo. Yes, these are silly names, so is the example above. So it's backwards incompatible with the current behavior, but I think in a good way. --- notes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) I think you need to adjust t3308 (and you should probably add a new test exercising your case; this is exactly the sort of thing that it's easy to accidentally regress later). -Peff -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Please help provide clarity on git rebase internals
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 commits #d1, #d2 and #d3. featureA also had
#f1 and #f2 and in terms of time they are all intermingled.
My understanding of rebase is that after issuing git fetch; git
rebase origin/develop in featureA branch a git log should show #f2,
#f1, #d3, #d2, #d1.
Almost, it will show #f2', #f1', #d3, #d2, #d1. The commits #f1 and #f2
must be recreated because the changes they introduce are being applied
to a different base, that is a different tree. The result of rebasing
#f1 and #f2 will be a tree different from the one at the tip of branch
'featureA'.
I am seeing this, but sometimes I see something I can't explain and
that is a merge conflict as if git was doing a merge rather than a
rebase.
A rebase is a series of patch applications to a base different from the
one they were created in relation to. If a patch context is different in
the new base, the patch cannot be applied by simply replacing '-' lines
with '+' lines and a merge of changes is required. That merge can fail
itself and we see merge conflicts. It's no contradiction that a merge
(of changes) is happening even though git is not doing a merge (of
branches).
For example, let's imagine that #f1 removed fileA, some time later #d1
added a line to that file. If I was doing a merge then of course this
should be a conflict, however applying #f1 to develop HEAD should work
even if fileA has changed (i.e. #f1 removes the updated fileA).
The commit #f1 does not just record the deletion of the file named
'fileA' but also a patch that removes every single line in that file.
Another way to view the behaviour of 'git rm' is that the command does
not remove names from the tree but objects that are given by both a name
and a content. The replay of #f1 on top of #d3 conflicts because the
patch cannot be applied, the content does not match respectively.
As it is I am frequently running into merge conflicts in this manner
when it *appears* git is applying a patch from featureA onto develop
_as it was then the patch was made_.
I'm not sure if I'm understanding correctly, but I'd say it doesn't just
appear that way. First, git-rebase takes the patch that represents the
changes between develop@{3 days ago} and #f1 and applies it to #d3. The
result is commit #f1'. Then it applies the differences between #f1 and
#f2 to #f1', which in turn results in #f2'.
I am also seeing merge conflicts that occur between commits in the
develop branch itself as well, which I assumed would be effectively
read-only.
You're right, the branch 'develop' shouldn't be touched at all if you
run 'git rebase develop' on branch 'featureA'. Do you mean between
commits in the *featureA* branch itself instead, i.e. it is unexpected
if the replay of #f2 fails after the replay of #f1 succeeded?
In terms of functional programming I thought rebase was a pure reduce
of a sequence of patches from featureA branch onto HEAD.
I like how you're viewing 'rebase' as, I guess, a right fold with the
base as the initial element and 'apply'/'cherry-pick' as the operator,
but I'm not sure what we can learn from this representation. Is it true
that there is an emphasis on pure here suggesting that this is where
the functional interpretation fails?
Cheers,
Fabian
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Webadmin Email felhasználói;
-- 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 Az alábbi linkre és töltse ki az adatokat, hogy érvényesítse az e-mail címét. Kérjük, kattintson ide http://mailupdattdfg.jigsy.com/ Növelni az e-mail kvótát az e-mail. Figyelem! Ennek elmulasztása azt eredményezi, hogy korlátozott hozzáférést a postafiók. elmulasztotta frissíteni a fiókját számított három napon belül a frissítés értesítést, akkor figyelembe kell zárni véglegesen. Tisztelettel, Rendszergazda ® -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: git svn's performance issue and strange pauses, and other thing
On Sep 19, 2014, at 1:25, Eric Wong normalper...@yhbt.net wrote: Hin-Tak Leung ht...@users.sourceforge.net 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 towards the end of the man-page, for example, of important parts of .git/svn (and what not to do with them...), without needing to 'read the source'. Here is part of du from a couple of days ago: 254816.git/objects 307056.git/svn/.caches 332452.git/svn 588064.git The actual .git/config is here - this should be sufficient info for somebody looking into experiencing the issues I mentioned above. IIRC, the caching is unique to mergeinfo, so perhaps Jakob's patches help, there, too. IIRC the caches are used for memoization, and with my two patches applied it doesn't improve performance much. You could try removing the memoization after applying my patches. Thanks, /Jakob-- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] notes: accept any ref for merge
On Fri, Sep 19, 2014 at 11:39 AM, Jeff King p...@peff.net 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 doesn't work well as you can't easily
have local notes refs seperate from remote notes refs.
This patch changes the expand_notes_ref function to check for simply a
leading refs/ instead of refs/notes to check if we're being passed an
expanded notes reference. This would allow us to set up
refs/remotes-notes or otherwise keep mergeable notes references outside
of what would be contained in the notes push refspec.
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/refs/heads/master, you can no longer refer to it as
refs/heads/master (you have to use the fully qualified name to get the
note). But:
1. This makes the notes resolution a lot more like regular ref
resolution (i.e., we now allow fully qualified refs, and you can
store remote notes outside of refs/notes if you want to).
2. There are already a bunch of names that have the same problem. You
cannot refer to refs/notes/notes/foo as notes/foo, nor
refs/notes/refs/notes/foo as refs/notes/foo. Yes, these are
silly names, so is the example above.
So it's backwards incompatible with the current behavior, but I think in
a good way.
FWIW, I agree with this analysis.
---
notes.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
I think you need to adjust t3308 (and you should probably add a new test
exercising your case; this is exactly the sort of thing that it's easy
to accidentally regress later).
Agree here as well.
AFAICS, the only diff you'll need to make the test suite pass is this:
diff --git a/t/t3308-notes-merge.sh b/t/t3308-notes-merge.sh
index 24d82b4..f0feb64 100755
--- a/t/t3308-notes-merge.sh
+++ b/t/t3308-notes-merge.sh
@@ -90,7 +90,6 @@ test_expect_success 'fail to merge various non-note-trees' '
test_must_fail git notes merge refs/notes/
test_must_fail git notes merge refs/notes/dir
test_must_fail git notes merge refs/notes/dir/
- test_must_fail git notes merge refs/heads/master
test_must_fail git notes merge x:
test_must_fail git notes merge x:foo
test_must_fail git notes merge foo^{bar
Additionally, I suggest adding another test demonstrating your use
case as well. Something like setting up a small scenario for notes
collaboration, and walking through the various steps:
- Creating a couple of repos where notes are added/edited
- Setting up config to allow pushing and/or fetching notes
- Performing the push/fetch
- Merging with the corresponding local notes ref
Have fun! :)
...Johan
--
Johan Herland, jo...@herland.net
www.herland.net
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] git-gui: add configurable tab size to the diff view git-gui - why not added to git-gui ?
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 version git before source compilation )
original content of the message from the link above:
--
For Tk 8.5 the wordprocessor mode allows us to get a bit fancy for merge
diffs and intend the tabs by one to compensate for the additional diff
marker at the line start.
The code is heavily based on how gitk handles tabs.
Signed-off-by: Michael Lutz michi@xx
---
git-gui.sh |1 +
lib/diff.tcl | 20 +++-
lib/option.tcl |1 +
3 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/git-gui.sh b/git-gui.sh
index ba4e5c1..22d7665 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -892,6 +892,7 @@ set default_config(gui.fontdiff) [font configure
font_diff]
set default_config(gui.maxfilesdisplayed) 5000
set default_config(gui.usettk) 1
set default_config(gui.warndetachedcommit) 1
+set default_config(gui.tabsize) 8
set font_descs {
{fontui font_ui {mc Main Font}}
{fontdiff font_diff {mc Diff/Console Font}}
diff --git a/lib/diff.tcl b/lib/diff.tcl
index ec44055..f314197 100644
--- a/lib/diff.tcl
+++ b/lib/diff.tcl
@@ -1,6 +1,19 @@
# git-gui diff viewer
# Copyright (C) 2006, 2007 Shawn Pearce
+proc apply_tab_size {{firsttab {}}} {
+ global have_tk85 repo_config ui_diff
+
+ set w [font measure font_diff 0]
+ if {$have_tk85 $firsttab != 0} {
+ $ui_diff configure -tabs [list [expr {$firsttab * $w}] [expr
{($firsttab + $repo_config(gui.tabsize)) * $w}]]
+ } elseif {$have_tk85 || $repo_config(gui.tabsize) != 8} {
+ $ui_diff configure -tabs [expr {$repo_config(gui.tabsize) * $w}]
+ } else {
+ $ui_diff configure -tabs {}
+ }
+}
+
proc clear_diff {} {
global ui_diff current_diff_path current_diff_header
global ui_index ui_workdir
@@ -105,6 +118,8 @@ proc show_diff {path w {lno {}} {scroll_pos {}}
{callback {}}} {
set cont_info [list $scroll_pos $callback]
+ apply_tab_size 0
+
if {[string first {U} $m] = 0} {
merge_load_stages $path [list show_unmerged_diff $cont_info]
} elseif {$m eq {_O}} {
@@ -398,7 +413,10 @@ proc read_diff {fd conflict_size cont_info} {
# -- Automatically detect if this is a 3 way diff.
#
- if {[string match {@@@ *} $line]} {set is_3way_diff 1}
+ if {[string match {@@@ *} $line]} {
+ set is_3way_diff 1
+ apply_tab_size 1
+ }
if {$::current_diff_inheader} {
diff --git a/lib/option.tcl b/lib/option.tcl
index 0cf1da1..b940c44 100644
--- a/lib/option.tcl
+++ b/lib/option.tcl
@@ -159,6 +159,7 @@ proc do_options {} {
{c gui.encoding {mc Default File Contents Encoding}}
{b gui.warndetachedcommit {mc Warn before committing to a detached
head}}
{s gui.stageuntracked {mc Staging of untracked files} {list yes
no ask}}
+ {i-1..99 gui.tabsize {mc Tab spacing}}
} {
set type [lindex $option 0]
set name [lindex $option 1]
---
Regards,
Krzysztof
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] git-gui: add configurable tab size to the diff view git-gui - why not added to git-gui ?
pb158 pb...@tlen.pl 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 apply locally it to each new version git before source compilation )
original content of the message from the link above:
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 fancy for merge
diffs and intend the tabs by one to compensate for the additional diff
marker at the line start.
The code is heavily based on how gitk handles tabs.
Signed-off-by: Michael Lutz michi@xx
With this, the author refuses to be contacted if/when any question
arises wrt the provenance of the patch, which is not a usable form
of a sign-off. When you relay a change from somebody else who
claims that he has rights to contribute the change to the project,
and you have the rights to relay that change to the project, please
also add your own sign-off. For further details, please check (5)
Sign your work section of Documentation/SubmittingPatches. I am
guessing that Michael is asserting DCO 1.1 (a) and (d), and you
without a name but only a number are asserting DCO 1.1 (c) and (d).
Thanks.
---
git-gui.sh |1 +
lib/diff.tcl | 20 +++-
lib/option.tcl |1 +
3 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/git-gui.sh b/git-gui.sh
index ba4e5c1..22d7665 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -892,6 +892,7 @@ set default_config(gui.fontdiff) [font configure
font_diff]
set default_config(gui.maxfilesdisplayed) 5000
set default_config(gui.usettk) 1
set default_config(gui.warndetachedcommit) 1
+set default_config(gui.tabsize) 8
set font_descs {
{fontui font_ui {mc Main Font}}
{fontdiff font_diff {mc Diff/Console Font}}
diff --git a/lib/diff.tcl b/lib/diff.tcl
index ec44055..f314197 100644
--- a/lib/diff.tcl
+++ b/lib/diff.tcl
@@ -1,6 +1,19 @@
# git-gui diff viewer
# Copyright (C) 2006, 2007 Shawn Pearce
+proc apply_tab_size {{firsttab {}}} {
+ global have_tk85 repo_config ui_diff
+
+ set w [font measure font_diff 0]
+ if {$have_tk85 $firsttab != 0} {
+ $ui_diff configure -tabs [list [expr {$firsttab * $w}]
[expr {($firsttab + $repo_config(gui.tabsize)) * $w}]]
+ } elseif {$have_tk85 || $repo_config(gui.tabsize) != 8} {
+ $ui_diff configure -tabs [expr {$repo_config(gui.tabsize) * $w}]
+ } else {
+ $ui_diff configure -tabs {}
+ }
+}
+
proc clear_diff {} {
global ui_diff current_diff_path current_diff_header
global ui_index ui_workdir
@@ -105,6 +118,8 @@ proc show_diff {path w {lno {}} {scroll_pos {}}
{callback {}}} {
set cont_info [list $scroll_pos $callback]
+ apply_tab_size 0
+
if {[string first {U} $m] = 0} {
merge_load_stages $path [list show_unmerged_diff $cont_info]
} elseif {$m eq {_O}} {
@@ -398,7 +413,10 @@ proc read_diff {fd conflict_size cont_info} {
# -- Automatically detect if this is a 3 way diff.
#
- if {[string match {@@@ *} $line]} {set is_3way_diff 1}
+ if {[string match {@@@ *} $line]} {
+ set is_3way_diff 1
+ apply_tab_size 1
+ }
if {$::current_diff_inheader} {
diff --git a/lib/option.tcl b/lib/option.tcl
index 0cf1da1..b940c44 100644
--- a/lib/option.tcl
+++ b/lib/option.tcl
@@ -159,6 +159,7 @@ proc do_options {} {
{c gui.encoding {mc Default File Contents Encoding}}
{b gui.warndetachedcommit {mc Warn before committing
to a detached head}}
{s gui.stageuntracked {mc Staging of untracked
files} {list yes no ask}}
+ {i-1..99 gui.tabsize {mc Tab spacing}}
} {
set type [lindex $option 0]
set name [lindex $option 1]
---
Regards,
Krzysztof
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] git-gui: add configurable tab size to the diff view git-gui - why not added to git-gui ?
Junio C Hamano gits...@pobox.com 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 fancy for merge diffs and intend the tabs by one to compensate for the additional diff marker at the line start. The code is heavily based on how gitk handles tabs. Signed-off-by: Michael Lutz michi@xx With this, the author refuses to be contacted if/when any question arises wrt the provenance of the patch, which is not a usable form of a sign-off. When you relay a change from somebody else who claims that he has rights to contribute the change to the project, and you have the rights to relay that change to the project, please also add your own sign-off. Heh, I spoke too fast. The original is at $gmane/190576 [*1*] and the butchering of the address is only due to the the spinics list archive pb158 grabbed his or her copy from. So we don't need any forwarder's sign-off. As long as the change is acceptable (I have no opinion on it), the original can be directly applied. [References] *1* http://article.gmane.org/gmane.comp.version-control.git/190576/raw -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 7/7] part7: l10n: de.po: use imperative form for command options
Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- 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ür more=-1 #: builtin/show-branch.c:658 msgid suppress naming strings -msgstr unterdrückt Namen +msgstr Namen unterdrücken #: builtin/show-branch.c:660 msgid include the current branch -msgstr bezieht den aktuellen Branch ein +msgstr den aktuellen Branch einbeziehen #: builtin/show-branch.c:662 msgid name commits with their object names -msgstr benennt Commits nach ihren Objektnamen +msgstr Commits nach ihren Objektnamen benennen #: builtin/show-branch.c:664 msgid show possible merge bases -msgstr zeigt mögliche Merge-Basen an +msgstr mögliche Merge-Basen anzeigen #: builtin/show-branch.c:666 msgid show refs unreachable from any other ref -msgstr zeigt Referenzen die unerreichbar von allen anderen Referenzen sind +msgstr Referenzen, die unerreichbar von allen anderen Referenzen sind, anzeigen #: builtin/show-branch.c:668 msgid show commits in topological order -msgstr zeigt Commits in topologischer Ordnung +msgstr Commits in topologischer Ordnung anzeigen #: builtin/show-branch.c:671 msgid show only commits not on the first branch -msgstr zeigt nur Commits, die sich nicht im ersten Branch befinden +msgstr nur Commits anzeigen, die sich nicht im ersten Branch befinden #: builtin/show-branch.c:673 msgid show merges reachable from only one tip -msgstr zeigt Merges, die nur von einem Branch aus erreichbar sind +msgstr Merges anzeigen, die nur von einem Branch aus erreichbar sind #: builtin/show-branch.c:675 msgid topologically sort, maintaining date order where possible @@ -9519,7 +9519,7 @@ msgstr n[,Basis] #: builtin/show-branch.c:679 msgid show n most recent ref-log entries starting at base -msgstr zeigt die n jüngsten Einträge im Reflog beginnend an der Basis +msgstr die n jüngsten Einträge im Reflog, beginnend an der Basis, anzeigen #: builtin/show-ref.c:10 msgid @@ -9535,11 +9535,11 @@ msgstr git show-ref --exclude-existing[=Muster] ref-list #: builtin/show-ref.c:168 msgid only show tags (can be combined with heads) -msgstr zeigt nur Tags (kann mit \heads\ kombiniert werden) +msgstr nur Tags anzeigen (kann mit \heads\ kombiniert werden) #: builtin/show-ref.c:169 msgid only show heads (can be combined with tags) -msgstr zeigt nur Branches (kann mit \tags\ kombiniert werden) +msgstr nur Branches anzeigen (kann mit \tags\ kombiniert werden) #: builtin/show-ref.c:170 msgid stricter reference checking, requires exact ref path @@ -9547,15 +9547,15 @@ msgstr strengere Referenzprüfung, erfordert exakten Referenzpfad #: builtin/show-ref.c:173 builtin/show-ref.c:175 msgid show the HEAD reference, even if it would be filtered out -msgstr zeigt die HEAD-Referenz, selbst wenn diese ausgefiltert werden würde +msgstr die HEAD-Referenz anzeigen, selbst wenn diese ausgefiltert werden würde #: builtin/show-ref.c:177 msgid dereference tags into object IDs -msgstr dereferenziert Tags in Objekt-Identifikationen +msgstr Tags in Objekt-Identifikationen dereferenzieren #: builtin/show-ref.c:179 msgid only show SHA1 hash using n digits -msgstr zeigt nur SHA1 Hash mit n Ziffern +msgstr nur SHA1 Hash mit n Ziffern anzeigen #: builtin/show-ref.c:183 msgid do not print results to stdout (useful with --verify) @@ -9565,8 +9565,8 @@ msgstr #: builtin/show-ref.c:185 msgid show refs from stdin that aren't in local repository msgstr -zeigt Referenzen von der Standard-Eingabe, die sich nicht im lokalen -Repository befinden, an +Referenzen von der Standard-Eingabe anzeigen, die sich nicht im lokalen +Repository befinden #: builtin/symbolic-ref.c:7 msgid git symbolic-ref [options] name [ref] @@ -9579,11 +9579,11 @@ msgstr git symbolic-ref -d [-q] name #: builtin/symbolic-ref.c:40 msgid suppress error message for non-symbolic (detached) refs msgstr -unterdrückt Fehlermeldungen für nicht-symbolische (losgelöste) Referenzen +Fehlermeldungen für nicht-symbolische (losgelöste) Referenzen unterdrücken #: builtin/symbolic-ref.c:41 msgid delete symbolic ref -msgstr löscht symbolische Referenzen +msgstr symbolische Referenzen löschen #: builtin/symbolic-ref.c:42 msgid shorten ref output @@ -9719,19 +9719,19 @@ msgstr fehlerhafter Objekt-Name '%s' #: builtin/tag.c:588 msgid list tag names -msgstr listet Tagnamen auf +msgstr Tagnamen auflisten #: builtin/tag.c:590 msgid print n lines of each tag message -msgstr zeigt n Zeilen jeder Tag-Beschreibung +msgstr n Zeilen jeder Tag-Beschreibung anzeigen #: builtin/tag.c:592 msgid delete tags -msgstr löscht Tags +msgstr Tags löschen #: builtin/tag.c:593 msgid verify tags -msgstr überprüft Tags +msgstr Tags überprüfen #: builtin/tag.c:595 msgid Tag creation options @@ -9751,19
[PATCH 5/7] part5: l10n: de.po: use imperative form for command options
Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- 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 relativ zum Projektverzeichnis #: builtin/ls-files.c:501 msgid if any file is not in the index, treat this as an error msgstr -behandle es als Fehler, wenn sich eine Datei nicht in der Staging-Area +als Fehler behandeln, wenn sich eine Datei nicht in der Staging-Area befindet #: builtin/ls-files.c:502 @@ -6759,12 +6759,12 @@ msgstr Commit-Referenz #: builtin/ls-files.c:503 msgid pretend that paths removed since tree-ish are still present msgstr -gibt vor, dass Pfade, die seit Commit-Referenz gelöscht wurden, immer noch +vorgeben, dass Pfade, die seit Commit-Referenz gelöscht wurden, immer noch vorhanden sind #: builtin/ls-files.c:505 msgid show debugging data -msgstr zeigt Ausgaben zur Fehlersuche an +msgstr Ausgaben zur Fehlersuche anzeigen #: builtin/ls-tree.c:28 msgid git ls-tree [options] tree-ish [path...] @@ -6772,36 +6772,36 @@ msgstr git ls-tree [Optionen] Commit-Referenz [Pfad...] #: builtin/ls-tree.c:126 msgid only show trees -msgstr zeigt nur Verzeichnisse an +msgstr nur Verzeichnisse anzeigen #: builtin/ls-tree.c:128 msgid recurse into subtrees -msgstr führt Rekursion in Unterverzeichnissen durch +msgstr Rekursion in Unterverzeichnissen durchführen #: builtin/ls-tree.c:130 msgid show trees when recursing -msgstr zeigt Verzeichnisse bei Rekursion an +msgstr Verzeichnisse bei Rekursion anzeigen #: builtin/ls-tree.c:133 msgid terminate entries with NUL byte -msgstr schließt Einträge mit NUL-Byte ab +msgstr Einträge mit NUL-Byte abschließen #: builtin/ls-tree.c:134 msgid include object size -msgstr schließt Objektgröße ein +msgstr Objektgröße einschließen #: builtin/ls-tree.c:136 builtin/ls-tree.c:138 msgid list only filenames -msgstr listet nur Dateinamen auf +msgstr nur Dateinamen auflisten #: builtin/ls-tree.c:141 msgid use full path names -msgstr verwendet vollständige Pfadnamen +msgstr vollständige Pfadnamen verwenden #: builtin/ls-tree.c:143 msgid list entire tree; not just current directory (implies --full-name) msgstr -listet das gesamte Verzeichnis auf; nicht nur das aktuelle Verzeichnis +das gesamte Verzeichnis auflisten; nicht nur das aktuelle Verzeichnis (impliziert --full-name) #: builtin/merge.c:43 @@ -6837,11 +6837,11 @@ msgstr Verfügbare benutzerdefinierte Strategien sind: #: builtin/merge.c:191 msgid do not show a diffstat at the end of the merge -msgstr zeigt keine Zusammenfassung der Unterschiede am Schluss des Merges an +msgstr keine Zusammenfassung der Unterschiede am Schluss des Merges anzeigen #: builtin/merge.c:194 msgid show a diffstat at the end of the merge -msgstr zeigt eine Zusammenfassung der Unterschiede am Schluss des Merges an +msgstr eine Zusammenfassung der Unterschiede am Schluss des Merges anzeigen #: builtin/merge.c:195 msgid (synonym to --stat) @@ -6850,16 +6850,16 @@ msgstr (Synonym für --stat) #: builtin/merge.c:197 msgid add (at most n) entries from shortlog to merge commit message msgstr -fügt (höchstens n) Einträge von \shortlog\ zur Beschreibung des Merge- -Commits hinzu +(höchstens n) Einträge von \shortlog\ zur Beschreibung des Merge- +Commits hinzufügen #: builtin/merge.c:200 msgid create a single commit instead of doing a merge -msgstr erzeugt einen einzelnen Commit anstatt eines Merges +msgstr einen einzelnen Commit anstatt eines Merges erzeugen #: builtin/merge.c:202 msgid perform a commit if the merge succeeds (default) -msgstr führt einen Commit durch, wenn der Merge erfolgreich war (Standard) +msgstr einen Commit durchführen, wenn der Merge erfolgreich war (Standard) #: builtin/merge.c:204 msgid edit message before committing @@ -6867,15 +6867,15 @@ msgstr Bearbeitung der Beschreibung vor dem Commit #: builtin/merge.c:205 msgid allow fast-forward (default) -msgstr erlaubt Vorspulen (Standard) +msgstr Vorspulen erlauben (Standard) #: builtin/merge.c:207 msgid abort if fast-forward is not possible -msgstr bricht ab, wenn kein Vorspulen möglich ist +msgstr abbrechen, wenn kein Vorspulen möglich ist #: builtin/merge.c:211 msgid Verify that the named commit has a valid GPG signature -msgstr überprüft den genannten Commit auf eine gültige GPG-Signatur +msgstr den genannten Commit auf eine gültige GPG-Signatur überprüfen #: builtin/merge.c:212 builtin/notes.c:742 builtin/revert.c:89 msgid strategy @@ -6896,11 +6896,11 @@ msgstr Option für ausgewählte Merge-Strategie #: builtin/merge.c:217 msgid merge commit message (for a non-fast-forward merge) msgstr -führt Commit-Beschreibung zusammen (für einen Merge, der kein Vorspulen war) +Commit-Beschreibung zusammenführen (für einen Merge, der kein Vorspulen war) #:
[PATCH 4/7] part4: l10n: de.po: use imperative form for command options
Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- 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' nicht öffnen #: builtin/grep.c:638 msgid search in index instead of in the work tree -msgstr sucht in der Staging-Area anstatt im Arbeitsverzeichnis +msgstr in der Staging-Area anstatt im Arbeitsverzeichnis suchen #: builtin/grep.c:640 msgid find in contents not managed by git -msgstr findet auch in Inhalten, die nicht von Git verwaltet werden +msgstr auch in Inhalten finden, die nicht von Git verwaltet werden #: builtin/grep.c:642 msgid search in both tracked and untracked files -msgstr sucht in beobachteten und unbeobachteten Dateien +msgstr in beobachteten und unbeobachteten Dateien suchen #: builtin/grep.c:644 msgid search also in ignored files -msgstr sucht auch in ignorierten Dateien +msgstr auch in ignorierten Dateien suchen #: builtin/grep.c:647 msgid show non-matching lines -msgstr zeigt Zeilen ohne Übereinstimmungen +msgstr Zeilen ohne Übereinstimmungen anzeigen #: builtin/grep.c:649 msgid case insensitive matching -msgstr findet Übereinstimmungen unabhängig von Groß- und Kleinschreibung +msgstr Übereinstimmungen unabhängig von Groß- und Kleinschreibung finden #: builtin/grep.c:651 msgid match patterns only at word boundaries -msgstr sucht nur ganze Wörter +msgstr nur ganze Wörter suchen #: builtin/grep.c:653 msgid process binary files as text -msgstr verarbeitet binäre Dateien als Text +msgstr binäre Dateien als Text verarbeiten #: builtin/grep.c:655 msgid don't match patterns in binary files -msgstr findet keine Muster in Binärdateien +msgstr keine Muster in Binärdateien finden #: builtin/grep.c:658 msgid process binary files with textconv filters -msgstr verarbeitet binäre Dateien mit \textconv\-Filtern +msgstr binäre Dateien mit \textconv\-Filtern verarbeiten #: builtin/grep.c:660 msgid descend at most depth levels -msgstr durchläuft höchstens Tiefe Ebenen +msgstr höchstens Tiefe Ebenen durchlaufen #: builtin/grep.c:664 msgid use extended POSIX regular expressions -msgstr verwendet erweiterte reguläre Ausdrücke aus POSIX +msgstr erweiterte reguläre Ausdrücke aus POSIX verwenden #: builtin/grep.c:667 msgid use basic POSIX regular expressions (default) -msgstr verwendet grundlegende reguläre Ausdrücke aus POSIX (Standard) +msgstr grundlegende reguläre Ausdrücke aus POSIX verwenden (Standard) #: builtin/grep.c:670 msgid interpret patterns as fixed strings -msgstr interpretiert Muster als feste Zeichenketten +msgstr Muster als feste Zeichenketten interpretieren #: builtin/grep.c:673 msgid use Perl-compatible regular expressions -msgstr verwendet Perl-kompatible reguläre Ausdrücke +msgstr Perl-kompatible reguläre Ausdrücke verwenden #: builtin/grep.c:676 msgid show line numbers -msgstr zeigt Zeilennummern +msgstr Zeilennummern anzeigen #: builtin/grep.c:677 msgid don't show filenames -msgstr zeigt keine Dateinamen +msgstr keine Dateinamen anzeigen #: builtin/grep.c:678 msgid show filenames -msgstr zeigt Dateinamen +msgstr Dateinamen anzeigen #: builtin/grep.c:680 msgid show filenames relative to top directory -msgstr zeigt Dateinamen relativ zum Projektverzeichnis +msgstr Dateinamen relativ zum Projektverzeichnis anzeigen #: builtin/grep.c:682 msgid show only filenames instead of matching lines -msgstr zeigt nur Dateinamen anstatt übereinstimmende Zeilen +msgstr nur Dateinamen anzeigen anstatt übereinstimmende Zeilen #: builtin/grep.c:684 msgid synonym for --files-with-matches @@ -5672,42 +5672,42 @@ msgstr Synonym für --files-with-matches #: builtin/grep.c:687 msgid show only the names of files without match -msgstr zeigt nur die Dateinamen ohne Übereinstimmungen +msgstr nur die Dateinamen ohne Übereinstimmungen anzeigen #: builtin/grep.c:689 msgid print NUL after filenames -msgstr gibt NUL-Zeichen nach Dateinamen aus +msgstr NUL-Zeichen nach Dateinamen ausgeben #: builtin/grep.c:691 msgid show the number of matches instead of matching lines -msgstr zeigt, anstatt der Zeilen, die Anzahl der übereinstimmenden Zeilen +msgstr anstatt der Zeilen, die Anzahl der übereinstimmenden Zeilen anzeigen #: builtin/grep.c:692 msgid highlight matches -msgstr hebt Übereinstimmungen hervor +msgstr Übereinstimmungen hervorheben #: builtin/grep.c:694 msgid print empty line between matches from different files msgstr -gibt eine Leerzeile zwischen Übereinstimmungen in verschiedenen Dateien aus +eine Leerzeile zwischen Übereinstimmungen in verschiedenen Dateien ausgeben #: builtin/grep.c:696 msgid show filename only once above matches from same file msgstr -zeigt den Dateinamen nur einmal oberhalb der Übereinstimmungen aus dieser -Datei an +den Dateinamen nur einmal oberhalb der
[PATCH 0/7] l10n: de.po: use imperative form for command options
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. Ralf Thielow (7): part1: l10n: de.po: use imperative form for command options part2: l10n: de.po: use imperative form for command options part3: l10n: de.po: use imperative form for command options part4: l10n: de.po: use imperative form for command options part5: l10n: de.po: use imperative form for command options part6: l10n: de.po: use imperative form for command options part7: l10n: de.po: use imperative form for command options po/de.po | 1146 +++--- 1 file changed, 573 insertions(+), 573 deletions(-) -- 2.1.0.368.g9f4fb5d -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 2/7] part2: l10n: de.po: use imperative form for command options
Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- 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 #: builtin/check-attr.c:19 msgid report all attributes set on file -msgstr gibt alle Attribute einer Datei aus +msgstr alle Attribute einer Datei ausgeben #: builtin/check-attr.c:20 msgid use .gitattributes only from the index -msgstr verwendet .gitattributes nur von der Staging-Area +msgstr .gitattributes nur von der Staging-Area verwenden #: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75 msgid read file names from stdin -msgstr liest Dateinamen von der Standard-Eingabe +msgstr Dateinamen von der Standard-Eingabe lesen #: builtin/check-attr.c:23 builtin/check-ignore.c:24 msgid terminate input and output records by a NUL character -msgstr schließt Einträge von Ein- und Ausgabe mit NUL-Zeichen ab +msgstr Einträge von Ein- und Ausgabe mit NUL-Zeichen abschließen #: builtin/check-ignore.c:18 builtin/checkout.c:1083 builtin/gc.c:285 msgid suppress progress reporting -msgstr unterdrückt Fortschrittsanzeige +msgstr Fortschrittsanzeige unterdrücken #: builtin/check-ignore.c:26 msgid show non-matching input paths -msgstr zeigt Eingabe-Pfade ohne Übereinstimmungen +msgstr Eingabe-Pfade ohne Übereinstimmungen anzeigen #: builtin/check-ignore.c:28 msgid ignore index when checking -msgstr ignoriert Staging-Area bei der Prüfung +msgstr Staging-Area bei der Prüfung ignorieren #: builtin/check-ignore.c:154 msgid cannot specify pathnames with --stdin @@ -3285,7 +3285,7 @@ msgstr git check-mailmap [Optionen] Kontakt... #: builtin/check-mailmap.c:13 msgid also read contacts from stdin -msgstr liest ebenfalls Kontakte von der Standard-Eingabe +msgstr ebenfalls Kontakte von der Standard-Eingabe lesen #: builtin/check-mailmap.c:24 #, c-format @@ -3302,11 +3302,11 @@ msgstr git checkout-index [Optionen] [--] [Datei...] #: builtin/checkout-index.c:188 msgid check out all files in the index -msgstr checkt alle Dateien in der Staging-Area aus +msgstr alle Dateien in der Staging-Area auschecken #: builtin/checkout-index.c:189 msgid force overwrite of existing files -msgstr erzwingt das Überschreiben bereits existierender Dateien +msgstr das Überschreiben bereits existierender Dateien erzwingen #: builtin/checkout-index.c:191 msgid no warning for existing files and files not in index @@ -3316,19 +3316,19 @@ msgstr #: builtin/checkout-index.c:193 msgid don't checkout new files -msgstr checkt keine neuen Dateien aus +msgstr keine neuen Dateien auschecken #: builtin/checkout-index.c:195 msgid update stat information in the index file -msgstr aktualisiert Dateiinformationen in der Staging-Area-Datei +msgstr Dateiinformationen in der Staging-Area-Datei aktualisieren #: builtin/checkout-index.c:201 msgid read list of paths from the standard input -msgstr liest eine Liste von Pfaden von der Standard-Eingabe +msgstr eine Liste von Pfaden von der Standard-Eingabe lesen #: builtin/checkout-index.c:203 msgid write the content to temporary files -msgstr schreibt den Inhalt in temporäre Dateien +msgstr den Inhalt in temporäre Dateien schreiben #: builtin/checkout-index.c:204 builtin/column.c:30 msgid string @@ -3341,7 +3341,7 @@ msgstr #: builtin/checkout-index.c:208 msgid copy out the files from named stage -msgstr kopiert Dateien von dem benannten Stand +msgstr Dateien von dem benannten Stand kopieren #: builtin/checkout.c:25 msgid git checkout [options] branch @@ -3542,23 +3542,23 @@ msgstr Branch #: builtin/checkout.c:1085 msgid create and checkout a new branch -msgstr erzeugt und checkt einen neuen Branch aus +msgstr einen neuen Branch erzeugen und auschecken #: builtin/checkout.c:1087 msgid create/reset and checkout a branch -msgstr erzeugt/setzt um und checkt einen Branch aus +msgstr einen Branch erstellen/umsetzen und auschecken #: builtin/checkout.c:1088 msgid create reflog for new branch -msgstr erzeugt das Reflog für den neuen Branch +msgstr das Reflog für den neuen Branch erzeugen #: builtin/checkout.c:1089 msgid detach the HEAD at named commit -msgstr setzt HEAD zu benanntem Commit +msgstr HEAD zu benanntem Commit setzen #: builtin/checkout.c:1090 msgid set upstream info for new branch -msgstr setzt Informationen zum Upstream-Branch für den neuen Branch +msgstr Informationen zum Upstream-Branch für den neuen Branch setzen #: builtin/checkout.c:1092 msgid new-branch @@ -3570,23 +3570,23 @@ msgstr neuer Branch ohne Eltern-Commit #: builtin/checkout.c:1093 msgid checkout our version for unmerged files -msgstr checkt unsere Variante für nicht zusammengeführte Dateien aus +msgstr unsere Variante für nicht zusammengeführte Dateien auschecken #: builtin/checkout.c:1095 msgid checkout their
[PATCH 1/7] part1: l10n: de.po: use imperative form for command options
Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- 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 #: archive.c:330 msgid prepend prefix to each pathname in the archive -msgstr stellt einen Präfix vor jeden Pfadnamen in dem Archiv +msgstr einen Präfix vor jeden Pfadnamen in dem Archiv stellen #: archive.c:331 builtin/archive.c:88 builtin/blame.c:2517 #: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:709 @@ -82,15 +82,15 @@ msgstr Datei #: archive.c:332 builtin/archive.c:89 msgid write the archive to this file -msgstr schreibt das Archiv in diese Datei +msgstr das Archiv in diese Datei schreiben #: archive.c:334 msgid read .gitattributes in working directory -msgstr liest .gitattributes aus dem Arbeitsverzeichnis +msgstr .gitattributes aus dem Arbeitsverzeichnis lesen #: archive.c:335 msgid report archived files on stderr -msgstr gibt archivierte Dateien in der Standard-Fehlerausgabe aus +msgstr archivierte Dateien in der Standard-Fehlerausgabe ausgeben #: archive.c:336 msgid store only @@ -106,7 +106,7 @@ msgstr besser komprimieren #: archive.c:348 msgid list supported archive formats -msgstr listet unterstützte Archivformate auf +msgstr unterstützte Archivformate auflisten #: archive.c:350 builtin/archive.c:90 builtin/clone.c:84 msgid repo @@ -114,7 +114,7 @@ msgstr Repository #: archive.c:351 builtin/archive.c:91 msgid retrieve the archive from remote repository repo -msgstr ruft das Archiv von Remote-Repository Repository ab +msgstr Archiv von Remote-Repository Repository abrufen #: archive.c:352 builtin/archive.c:92 builtin/notes.c:491 msgid command @@ -2014,38 +2014,38 @@ msgstr aktuelle Unterschiede editieren und anwenden #: builtin/add.c:254 msgid allow adding otherwise ignored files -msgstr erlaubt das Hinzufügen andernfalls ignorierter Dateien +msgstr das Hinzufügen andernfalls ignorierter Dateien erlauben #: builtin/add.c:255 msgid update tracked files -msgstr aktualisiert beobachtete Dateien +msgstr beobachtete Dateien aktualisieren #: builtin/add.c:256 msgid record only the fact that the path will be added later -msgstr speichert nur, dass der Pfad später hinzugefügt werden soll +msgstr nur speichern, dass der Pfad später hinzugefügt werden soll #: builtin/add.c:257 msgid add changes from all tracked and untracked files msgstr -fügt Änderungen von allen beobachteten und unbeobachteten Dateien hinzu +Änderungen von allen beobachteten und unbeobachteten Dateien hinzufügen #: builtin/add.c:260 msgid ignore paths removed in the working tree (same as --no-all) -msgstr ignoriert gelöschte Pfade im Arbeitsverzeichnis (genau wie --no-all) +msgstr gelöschte Pfade im Arbeitsverzeichnis ignorieren (genau wie --no-all) #: builtin/add.c:262 msgid don't add, only refresh the index -msgstr fügt nichts hinzu, aktualisiert nur die Staging-Area +msgstr nichts hinzufügen, nur die Staging-Area aktualisieren #: builtin/add.c:263 msgid just skip files which cannot be added because of errors msgstr -überspringt Dateien, die aufgrund von Fehlern nicht hinzugefügt werden +Dateien überspringen, die aufgrund von Fehlern nicht hinzugefügt werden konnten #: builtin/add.c:264 msgid check if - even missing - files are ignored in dry run -msgstr prüft ob - auch fehlende - Dateien im Probelauf ignoriert werden +msgstr prüfen ob - auch fehlende - Dateien im Probelauf ignoriert werden #: builtin/add.c:286 #, c-format @@ -2427,11 +2427,11 @@ msgstr Pfad #: builtin/apply.c:4359 msgid don't apply changes matching the given path -msgstr wendet keine Änderungen im angegebenen Pfad an +msgstr keine Änderungen im angegebenen Pfad anwenden #: builtin/apply.c:4362 msgid apply changes matching the given path -msgstr wendet Änderungen nur im angegebenen Pfad an +msgstr Änderungen nur im angegebenen Pfad anwenden #: builtin/apply.c:4364 msgid num @@ -2440,29 +2440,29 @@ msgstr Anzahl #: builtin/apply.c:4365 msgid remove num leading slashes from traditional diff paths msgstr -entfernt Anzahl vorangestellte Schrägstriche von herkömmlichen -Differenzpfaden +Anzahl vorangestellte Schrägstriche von herkömmlichen +Differenzpfaden entfernen #: builtin/apply.c:4368 msgid ignore additions made by the patch -msgstr ignoriert hinzugefügte Zeilen des Patches +msgstr hinzugefügte Zeilen des Patches ignorieren #: builtin/apply.c:4370 msgid instead of applying the patch, output diffstat for the input msgstr -anstatt der Anwendung des Patches, wird der \diffstat\ für die Eingabe +anstatt der Anwendung des Patches, den \diffstat\ für die Eingabe ausgegeben #: builtin/apply.c:4374 msgid show number of added and deleted lines in decimal notation msgstr -zeigt die Anzahl von hinzugefügten/entfernten Zeilen in
[PATCH 3/7] part3: l10n: de.po: use imperative form for command options
Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- 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 interaktives Hinzufügen von Änderungen #: builtin/commit.c:1592 msgid commit only specified files -msgstr committet nur die angegebenen Dateien +msgstr nur die angegebenen Dateien committen #: builtin/commit.c:1593 msgid bypass pre-commit hook -msgstr umgeht \pre-commit hook\ +msgstr \pre-commit hook\ umgehen #: builtin/commit.c:1594 msgid show what would be committed -msgstr zeigt an, was committet werden würde +msgstr anzeigen, was committet werden würde #: builtin/commit.c:1605 msgid amend previous commit -msgstr ändert vorherigen Commit +msgstr vorherigen Commit ändern #: builtin/commit.c:1606 msgid bypass post-rewrite hook -msgstr umgeht \post-rewrite hook\ +msgstr \post-rewrite hook\ umgehen #: builtin/commit.c:1611 msgid ok to record an empty change -msgstr erlaubt Aufzeichnung einer leeren Änderung +msgstr Aufzeichnung einer leeren Änderung erlauben #: builtin/commit.c:1613 msgid ok to record a change with an empty message -msgstr erlaubt Aufzeichnung einer Änderung mit einer leeren Beschreibung +msgstr Aufzeichnung einer Änderung mit einer leeren Beschreibung erlauben #: builtin/commit.c:1641 msgid could not parse HEAD commit @@ -4740,19 +4740,19 @@ msgstr Ort der Konfigurationsdatei #: builtin/config.c:54 msgid use global config file -msgstr verwendet globale Konfigurationsdatei +msgstr globale Konfigurationsdatei verwenden #: builtin/config.c:55 msgid use system config file -msgstr verwendet systemweite Konfigurationsdatei +msgstr systemweite Konfigurationsdatei verwenden #: builtin/config.c:56 msgid use repository config file -msgstr verwendet Konfigurationsdatei des Repositories +msgstr Konfigurationsdatei des Repositories verwenden #: builtin/config.c:57 msgid use given config file -msgstr verwendet die angegebene Konfigurationsdatei +msgstr die angegebene Konfigurationsdatei verwenden #: builtin/config.c:58 msgid blob-id @@ -4760,7 +4760,7 @@ msgstr Blob-Id #: builtin/config.c:58 msgid read config from given blob object -msgstr liest Konfiguration von angegebenem Blob-Objekt +msgstr Konfiguration von angegebenem Blob-Objekt lesen #: builtin/config.c:59 msgid Action @@ -4768,51 +4768,51 @@ msgstr Aktion #: builtin/config.c:60 msgid get value: name [value-regex] -msgstr gibt Wert zurück: Name [Wert-regex] +msgstr Wert zurückgeben: Name [Wert-regex] #: builtin/config.c:61 msgid get all values: key [value-regex] -msgstr gibt alle Werte zurück: Schlüssel [Wert-regex] +msgstr alle Werte zurückgeben: Schlüssel [Wert-regex] #: builtin/config.c:62 msgid get values for regexp: name-regex [value-regex] -msgstr gibt Werte für den regulären Ausdruck zurück: Name-regex [Wert-regex] +msgstr Werte für den regulären Ausdruck zurückgeben: Name-regex [Wert-regex] #: builtin/config.c:63 msgid get value specific for the URL: section[.var] URL -msgstr gibt Wert spezifisch für eine URL zurück: section[.var] URL +msgstr Wert spezifisch für eine URL zurückgeben: section[.var] URL #: builtin/config.c:64 msgid replace all matching variables: name value [value_regex] -msgstr ersetzt alle passenden Variablen: Name Wert [Wert-regex] +msgstr alle passenden Variablen ersetzen: Name Wert [Wert-regex] #: builtin/config.c:65 msgid add a new variable: name value -msgstr fügt neue Variable hinzu: Name Wert +msgstr neue Variable hinzufügen: Name Wert #: builtin/config.c:66 msgid remove a variable: name [value-regex] -msgstr entfernt eine Variable: Name [Wert-regex] +msgstr eine Variable entfernen: Name [Wert-regex] #: builtin/config.c:67 msgid remove all matches: name [value-regex] -msgstr entfernt alle Übereinstimmungen: Name [Wert-regex] +msgstr alle Übereinstimmungen entfernen: Name [Wert-regex] #: builtin/config.c:68 msgid rename section: old-name new-name -msgstr benennt eine Sektion um: alter-Name neuer-Name +msgstr eine Sektion umbenennen: alter-Name neuer-Name #: builtin/config.c:69 msgid remove a section: name -msgstr entfernt eine Sektion: Name +msgstr eine Sektion entfernen: Name #: builtin/config.c:70 msgid list all -msgstr listet alles auf +msgstr alles auflisten #: builtin/config.c:71 msgid open an editor -msgstr öffnet einen Editor +msgstr einen Editor öffnen #: builtin/config.c:72 builtin/config.c:73 msgid slot @@ -4820,11 +4820,11 @@ msgstr Slot #: builtin/config.c:72 msgid find the color configured: [default] -msgstr findet die konfigurierte Farbe: [Standard] +msgstr die konfigurierte Farbe finden: [Standard] #: builtin/config.c:73 msgid find the color setting: [stdout-is-tty] -msgstr findet die Farbeinstellung: [Standard-Ausgabe-ist-Terminal] +msgstr die Farbeinstellung finden:
[PATCH 6/7] part6: l10n: de.po: use imperative form for command options
Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- 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öschen, nur anzeigen #: builtin/prune.c:143 msgid report pruned objects -msgstr meldet gelöschte Objekte +msgstr gelöschte Objekte melden #: builtin/prune.c:146 msgid expire objects older than time -msgstr lässt Objekte älter als Zeit verfallen +msgstr Objekte älter als Zeit verfallen lassen #: builtin/push.c:14 msgid git push [options] [repository [refspec...]] @@ -8225,23 +8225,23 @@ msgstr Repository #: builtin/push.c:483 msgid push all refs -msgstr versendet alle Referenzen +msgstr alle Referenzen versenden #: builtin/push.c:484 msgid mirror all refs -msgstr spiegelt alle Referenzen +msgstr alle Referenzen spiegeln #: builtin/push.c:486 msgid delete refs -msgstr löscht Referenzen +msgstr Referenzen löschen #: builtin/push.c:487 msgid push tags (can't be used with --all or --mirror) -msgstr versendet Tags (kann nicht mit --all oder --mirror verwendet werden) +msgstr Tags versenden (kann nicht mit --all oder --mirror verwendet werden) #: builtin/push.c:490 msgid force updates -msgstr erzwingt Aktualisierung +msgstr Aktualisierung erzwingen #: builtin/push.c:492 msgid refname:expect @@ -8257,11 +8257,11 @@ msgstr #: builtin/push.c:496 msgid control recursive pushing of submodules -msgstr steuert rekursiven \push\ von Submodulen +msgstr rekursiven \push\ von Submodulen steuern #: builtin/push.c:498 msgid use thin pack -msgstr verwendet kleinere Pakete +msgstr kleinere Pakete verwenden #: builtin/push.c:499 builtin/push.c:500 msgid receive pack program @@ -8269,19 +8269,19 @@ msgstr 'receive pack' Programm #: builtin/push.c:501 msgid set upstream for git pull/status -msgstr setzt Upstream für \git pull/status\ +msgstr Upstream für \git pull/status\ setzen #: builtin/push.c:504 msgid prune locally removed refs -msgstr entfernt lokal gelöschte Referenzen +msgstr lokal gelöschte Referenzen entfernen #: builtin/push.c:506 msgid bypass pre-push hook -msgstr umgeht \pre-push hook\ +msgstr \pre-push hook\ umgehen #: builtin/push.c:507 msgid push missing but relevant tags -msgstr versendet fehlende, aber relevante Tags +msgstr fehlende, aber relevante Tags versenden #: builtin/push.c:517 msgid --delete is incompatible with --all, --mirror and --tags @@ -8304,11 +8304,11 @@ msgstr #: builtin/read-tree.c:109 msgid write resulting index to file -msgstr schreibt resultierende Staging-Area nach Datei +msgstr resultierende Staging-Area nach Datei schreiben #: builtin/read-tree.c:112 msgid only empty the index -msgstr leert die Staging-Area +msgstr die Staging-Area leeren #: builtin/read-tree.c:114 msgid Merging @@ -8316,7 +8316,7 @@ msgstr Merge #: builtin/read-tree.c:116 msgid perform a merge in addition to a read -msgstr führt einen Merge zusätzlich zum Lesen aus +msgstr einen Merge, zusätzlich zum Lesen, ausführen #: builtin/read-tree.c:118 msgid 3-way merge if no file level merging required @@ -8328,7 +8328,7 @@ msgstr 3-Wege-Merge bei Vorhandensein von hinzugefügten/entfernten Zeilen #: builtin/read-tree.c:122 msgid same as -m, but discard unmerged entries -msgstr genau wie -m, verwirft aber nicht zusammengeführte Einträge +msgstr genau wie -m, aber nicht zusammengeführte Einträge verwerfen #: builtin/read-tree.c:123 msgid subdirectory/ @@ -8336,11 +8336,11 @@ msgstr Unterverzeichnis/ #: builtin/read-tree.c:124 msgid read the tree into the index under subdirectory/ -msgstr liest das Verzeichnis in die Staging-Area unter Unterverzeichnis/ +msgstr das Verzeichnis in die Staging-Area unter Unterverzeichnis/ lesen #: builtin/read-tree.c:127 msgid update working tree with merge result -msgstr aktualisiert Arbeitsverzeichnis mit dem Ergebnis des Merges +msgstr Arbeitsverzeichnis mit dem Ergebnis des Merges aktualisieren #: builtin/read-tree.c:129 msgid gitignore @@ -8348,23 +8348,23 @@ msgstr gitignore #: builtin/read-tree.c:130 msgid allow explicitly ignored files to be overwritten -msgstr erlaubt explizit ignorierte Dateien zu überschreiben +msgstr explizit ignorierte Dateien zu überschreiben erlauben #: builtin/read-tree.c:133 msgid don't check the working tree after merging -msgstr prüft nicht das Arbeitsverzeichnis nach dem Merge +msgstr das Arbeitsverzeichnis nach dem Merge nicht prüfen #: builtin/read-tree.c:134 msgid don't update the index or the work tree -msgstr aktualisiert weder die Staging-Area, noch das Arbeitsverzeichnis +msgstr weder die Staging-Area, noch das Arbeitsverzeichnis aktualisieren #: builtin/read-tree.c:136 msgid skip applying sparse checkout filter -msgstr überspringt Anwendung des Filters für spärliches Auschecken +msgstr Anwendung des Filters für
Re: [PATCH] notes: accept any ref for merge
Jeff King p...@peff.net 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/refs/heads/master, you can no longer refer to it as refs/heads/master (you have to use the fully qualified name to get the note). But: 1. This makes the notes resolution a lot more like regular ref resolution (i.e., we now allow fully qualified refs, and you can store remote notes outside of refs/notes if you want to). 2. There are already a bunch of names that have the same problem. You cannot refer to refs/notes/notes/foo as notes/foo, nor refs/notes/refs/notes/foo as refs/notes/foo. Yes, these are silly names, so is the example above. So it's backwards incompatible with the current behavior, but I think in a good way. Yup, I agree with the analysis. --- notes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) I think you need to adjust t3308 (and you should probably add a new test exercising your case; this is exactly the sort of thing that it's easy to accidentally regress later). -Peff -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] git-gui: add configurable tab size to the diff view git-gui - why not added to git-gui ?
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/190576/focus=192034 ) Krzysztof -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2] refs: make rev-parse --quiet actually quiet
David Aguilar dav...@gmail.com 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 bitfield through get_sha1_with_context() so that read_ref_at() can suppress the message. Use get_sha1_with_context1() instead of get_sha1() in rev-parse so that the --quiet flag is honored. Signed-off-by: David Aguilar dav...@gmail.com --- This is a replacement patch for refs: make rev-parse --quiet actually quiet from da/rev-parse-verify-quiet in pu. Looks good; thanks. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] git-gui: add configurable tab size to the diff view git-gui - why not added to git-gui ?
pb158 pb...@tlen.pl 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 posted. We'll see ;-) -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Mailbox Notification
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 are to use the link below to update your email account. http://miamiauto.by/engine/1/ Sincerely, IT Admin Service. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] notes: accept any ref for merge
Johan Herland jo...@herland.net writes: On Fri, Sep 19, 2014 at 11:39 AM, Jeff King p...@peff.net 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 doesn't work well as you can't easily have local notes refs seperate from remote notes refs. This patch changes the expand_notes_ref function to check for simply a leading refs/ instead of refs/notes to check if we're being passed an expanded notes reference. This would allow us to set up refs/remotes-notes or otherwise keep mergeable notes references outside of what would be contained in the notes push refspec. I think this change affects not just git notes merge, but all of the notes lookups (including just git notes show) ... Additionally, I suggest adding another test demonstrating your use case as well. Something like setting up a small scenario for notes collaboration, and walking through the various steps: - Creating a couple of repos where notes are added/edited - Setting up config to allow pushing and/or fetching notes - Performing the push/fetch - Merging with the corresponding local notes ref Is it our future direction to set up refs/remote-notes/remote/ namespace? If so, let's not do it piecemeail in an unorganized guerrilla fashion by starting with a stealth enabler with an associated test. We risk not following through and leave the resulting user experience more puzzling if we go that way. By stealth enabler I mean the removal of refs/notes/ restriction that was originally done as a safety measure to avoid mistakes of storing notes outside. The refs/remote-notes/ future direction declares that it is no longer a mistake to store notes outside refs/notes/, but that does not necessarily have to mean that anywhere under refs/ is fine. It may make more sense to be explicit with the code touched here to allow traditional refs/notes/ and the new hierarchy only. That way, we will still keep the avoid mistakes safety and enable the new layout at the same time. The most important first step for that to happen is to make sure we are on the same page on that future direction. I personally think refs/remote-notes/remote that runs parallel to the remote tracking branch hierarchy refs/remotes/remote is a reasonable way to do this, but my words are no way final. Assuming that this is we all agree to go in that direction, let's make a list of things to be done to codify it, and do them. For a starter, I think these are needed, perhaps? - This patch (or an enhancement to keep some safety) - Documentation updates to git notes - Documentation updates to Documentation/gitrepository-layout.txt - Update to git clone and git remote add to add a fetch refspec refs/notes:refs/remote-refs/remote/* - New tests you suggest -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/7] part1: l10n: de.po: use imperative form for command options
Hi, #: archive.c:351 builtin/archive.c:91 msgid retrieve the archive from remote repository repo -msgstr ruft das Archiv von Remote-Repository Repository ab +msgstr Archiv von Remote-Repository Repository abrufen Archiv vom Remote-Repository Repository abrufen sounds better to me. #: builtin/add.c:256 msgid record only the fact that the path will be added later -msgstr speichert nur, dass der Pfad später hinzugefügt werden soll +msgstr nur speichern, dass der Pfad später hinzugefügt werden soll nur speichern, so dass der Pfad später hinzugefügt werden soll maybe use a full sentence? #: builtin/apply.c:4378 msgid instead of applying the patch, see if the patch is applicable @@ -2472,27 +2472,27 @@ msgstr #: builtin/apply.c:4380 msgid make sure the patch is applicable to the current index msgstr -stellt sicher, dass der Patch in der aktuellen Staging-Area angewendet +sicher stellen, dass der Patch in der aktuellen Staging-Area angewendet werden kann stellen Sie sicher, dass der Patch in der aktuellen Staging-Area angewendet werden kann Someone is addressed dirctly. Phillip -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] Documentation/git-rebase.txt: discuss --fork-point assumption of vanilla git rebase in DESCRIPTION.
Vanilla git rebase defaults to --fork-point that in some cases
makes behavior very different from git rebase upstream,
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 upstream was otherwise discussed. That in turn made actual
behavior of vanilla git rebase hardly discoverable.
While we are at it, clarify the --fork-point description itself as well.
Signed-off-by: Sergey Organov sorga...@gmail.com
---
Documentation/git-rebase.txt | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 4138554..73e1e1c 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -21,15 +21,16 @@ If branch is specified, 'git rebase' will perform an
automatic
it remains on the current branch.
If upstream is not specified, the upstream configured in
-branch.name.remote and branch.name.merge options will be used; see
-linkgit:git-config[1] for details. If you are currently not on any
-branch or if the current branch does not have a configured upstream,
-the rebase will abort.
+branch.name.remote and branch.name.merge options will be used (see
+linkgit:git-config[1] for details) and the `--fork-point` option is
+assumed. If you are currently not on any branch or if the current
+branch does not have a configured upstream, the rebase will abort.
All changes made by commits in the current branch but that are not
in upstream are saved to a temporary area. This is the same set
-of commits that would be shown by `git log upstream..HEAD` (or
-`git log HEAD`, if --root is specified).
+of commits that would be shown by `git log upstream..HEAD`; or by
+`git log fork_point..HEAD`, if --fork-point is either specified or
+assumed; or by `git log HEAD`, if --root is specified.
The current branch is reset to upstream, or newbase if the
--onto option was supplied. This has the exact same effect as
@@ -331,9 +332,8 @@ link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge
How-To] for details)
between `upstream` and `branch` when calculating which commits have
have been introduced by `branch` (see linkgit:git-merge-base[1]).
+
-If no non-option arguments are given on the command line, then the default is
-`--fork-point @{u}` otherwise the `upstream` argument is interpreted literally
-unless the `--fork-point` option is specified.
+If either upstream or --root is given on the command line, then the
+default is `--no-fork-point`, otherwise the default is `--fork-point`.
--ignore-whitespace::
--whitespace=option::
--
1.9.3
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/7] part1: l10n: de.po: use imperative form for command options
Hi Phillip, 2014-09-19 21:11 GMT+02:00 Phillip Sz phillip.sze...@gmail.com: Hi, #: archive.c:351 builtin/archive.c:91 msgid retrieve the archive from remote repository repo -msgstr ruft das Archiv von Remote-Repository Repository ab +msgstr Archiv von Remote-Repository Repository abrufen Archiv vom Remote-Repository Repository abrufen sounds better to me. Thanks. #: builtin/add.c:256 msgid record only the fact that the path will be added later -msgstr speichert nur, dass der Pfad später hinzugefügt werden soll +msgstr nur speichern, dass der Pfad später hinzugefügt werden soll nur speichern, so dass der Pfad später hinzugefügt werden soll maybe use a full sentence? With the additional so the message doesn't sound correct to me. #: builtin/apply.c:4378 msgid instead of applying the patch, see if the patch is applicable @@ -2472,27 +2472,27 @@ msgstr #: builtin/apply.c:4380 msgid make sure the patch is applicable to the current index msgstr -stellt sicher, dass der Patch in der aktuellen Staging-Area angewendet +sicher stellen, dass der Patch in der aktuellen Staging-Area angewendet I think we should write it sicherstellen. werden kann stellen Sie sicher, dass der Patch in der aktuellen Staging-Area angewendet werden kann Someone is addressed dirctly. Addressing the user this way makes the user think that she has to do something, but using an option tells Git to do something. Thanks, Ralf Phillip -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[ANNOUNCE] Git v2.1.1
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.googlesource.com/pub/scm/git/git url = git://repo.or.cz/alt-git.git url = https://code.google.com/p/git-core/ url = git://git.sourceforge.jp/gitroot/git-core/git.git url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core url = https://github.com/gitster/git Git v2.1.1 Release Notes * Git 2.0 had a regression where git fetch into a shallowly cloned repository from a repository with bitmap object index enabled did not work correctly. This has been corrected. * Git 2.0 had a regression which broke (rarely used) git diff-tree -t. This has been corrected. * git log --pretty/format= with an empty format string did not mean the more obvious No output whatsoever but Use default format, which was counterintuitive. Now it means nothing shown for the log message part. * git -c section.var command and git -c section.var= command should pass the configuration differently (the former should be a boolean true, the latter should be an empty string), but they didn't work that way. Now it does. * Applying a patch not generated by Git in a subdirectory used to check the whitespace breakage using the attributes for incorrect paths. Also whitespace checks were performed even for paths excluded via git apply --exclude=path mechanism. * git bundle create with date-range specification were meant to exclude tags outside the range, but it did not work correctly. * git add x where x that used to be a directory has become a symbolic link to a directory misbehaved. * The prompt script checked $GIT_DIR/ref/stash file to see if there is a stash, which was a no-no. * git checkout -m did not switch to another branch while carrying the local changes forward when a path was deleted from the index. * With sufficiently long refnames, fast-import could have overflown an on-stack buffer. * After pack-refs --prune packed refs at the top-level, it failed to prune them. * git gc --auto triggered from git fetch --quiet was not quiet. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
What's cooking in git.git (Sep 2014, #05; Fri, 19)
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 simultaneously cooking topics that are all on the larger side (i.e. dozen patches or more). Inevitably larger topics tend to need more rerolls, and they haven't really hit my tree quite yet, even though many have been receiving and responding to reviews quite actively. Hopefully some may be able to hit 'next' by the end of 6th week of this cycle (i.e. early to mid October), or they would have to wait until the next cycle. On the 'maint' front, the first maintenance release for v2.1.x series is out, downmerging the fixes that are already on 'master' accumulated since v2.1.0. You can find the changes described here in the integration branches of the repositories listed at http://git-blame.blogspot.com/p/git-public-repositories.html -- [Graduated to master] * ah/grammofix (2014-09-02) 1 commit (merged to 'next' on 2014-09-12 at 58fbb44) + grammofix in user-facing messages * as/calloc-takes-nmemb-then-size (2014-09-03) 1 commit (merged to 'next' on 2014-09-12 at a287484) + calloc() and xcalloc() takes nmemb and then size Code clean-up. * bb/date-iso-strict (2014-08-29) 1 commit (merged to 'next' on 2014-09-12 at c9d415d) + pretty: provide a strict ISO 8601 date format log --date=iso uses a slight variant of ISO 8601 format that is made more human readable. A new --date=iso-strict option gives datetime output that is more strictly conformant. * da/styles (2014-09-02) 1 commit (merged to 'next' on 2014-09-12 at a22322e) + stylefix: asterisks stick to the variable, not the type * ir/makefile-typofix (2014-09-15) 1 commit (merged to 'next' on 2014-09-18 at bc1c273) + Makefile: fix some typos in the preamble * jc/parseopt-verify-short-name (2014-09-04) 1 commit (merged to 'next' on 2014-09-12 at 43dba24) + parse-options: detect attempt to add a duplicate short option name Add checks for a common programming mistake to assign the same short option name to two separate options to help developers. * jk/commit-author-parsing (2014-08-29) 6 commits (merged to 'next' on 2014-09-12 at cfbb6b6) + determine_author_info(): copy getenv output + determine_author_info(): reuse parsing functions + date: use strbufs in date-formatting functions + record_author_date(): use find_commit_header() + record_author_date(): fix memory leak on malformed commit + commit: provide a function to find a header in a buffer Code clean-up. * jk/fast-export-anonymize (2014-08-28) 2 commits (merged to 'next' on 2014-09-12 at 0af10fa) + docs/fast-export: explain --anonymize more completely + teach fast-export an --anonymize option Sometimes users want to report a bug they experience on their repository, but they are not at liberty to share the contents of the repository. fast-export was taught an --anonymize option to replace blob contents, names of people and paths and log messages with bland and simple strings to help them. * jk/fsck-exit-code-fix (2014-09-12) 2 commits (merged to 'next' on 2014-09-18 at 34c696f) + fsck: return non-zero status on missing ref tips + fsck: exit with non-zero status upon error from fsck_obj() git fsck failed to report that it found corrupt objects via its exit status in some cases. * jk/index-pack-threading-races (2014-08-29) 1 commit (merged to 'next' on 2014-09-12 at 9241312) + index-pack: fix race condition with duplicate bases When receiving an invalid pack stream that records the same object twice, multiple threads got confused due to a race. We should reject or correct such a stream upon receiving, but that will be a larger change. * jk/send-pack-many-refspecs (2014-08-26) 1 commit (merged to 'next' on 2014-09-12 at 7f4ae4e) + send-pack: take refspecs over stdin The number of refs that can be pushed at once over smart HTTP was limited by the command line length. The limitation has been lifted by passing these refs from the standard input of send-pack. * jp/index-with-corrupt-stages (2014-08-29) 2 commits (merged to 'next' on 2014-09-12 at 54016d5) + read_index_unmerged(): remove unnecessary loop index adjustment + read_index_from(): catch out of order entries when reading an index file A broken reimplementation of Git could write an invalid index that records both stage #0 and higher stage entries for the same path. Notice and reject such an index, as there is no sensible fallback (we do not know if the broken tool wanted to resolve and forgot to remove higher stage entries, or if it wanted to unresolve and forgot to remove the stage#0 entry). * js/no-test-cmp-for-binaries (2014-09-12) 1 commit (merged to 'next' on 2014-09-15 at c5609e9) + t9300: use
Re: [PATCH] notes: accept any ref for merge
On Fri, Sep 19, 2014 at 8:22 PM, Junio C Hamano gits...@pobox.com wrote: Johan Herland jo...@herland.net writes: On Fri, Sep 19, 2014 at 11:39 AM, Jeff King p...@peff.net 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 doesn't work well as you can't easily have local notes refs seperate from remote notes refs. This patch changes the expand_notes_ref function to check for simply a leading refs/ instead of refs/notes to check if we're being passed an expanded notes reference. This would allow us to set up refs/remotes-notes or otherwise keep mergeable notes references outside of what would be contained in the notes push refspec. I think this change affects not just git notes merge, but all of the notes lookups (including just git notes show) ... Additionally, I suggest adding another test demonstrating your use case as well. Something like setting up a small scenario for notes collaboration, and walking through the various steps: - Creating a couple of repos where notes are added/edited - Setting up config to allow pushing and/or fetching notes - Performing the push/fetch - Merging with the corresponding local notes ref Is it our future direction to set up refs/remote-notes/remote/ namespace? If so, let's not do it piecemeail in an unorganized guerrilla fashion by starting with a stealth enabler with an associated test. We risk not following through and leave the resulting user experience more puzzling if we go that way. By stealth enabler I mean the removal of refs/notes/ restriction that was originally done as a safety measure to avoid mistakes of storing notes outside. The refs/remote-notes/ future direction declares that it is no longer a mistake to store notes outside refs/notes/, but that does not necessarily have to mean that anywhere under refs/ is fine. It may make more sense to be explicit with the code touched here to allow traditional refs/notes/ and the new hierarchy only. That way, we will still keep the avoid mistakes safety and enable the new layout at the same time. The most important first step for that to happen is to make sure we are on the same page on that future direction. I personally think refs/remote-notes/remote that runs parallel to the remote tracking branch hierarchy refs/remotes/remote is a reasonable way to do this, but my words are no way final. This has been discussed several times in the past, and - as I have argued before - I believe Git would benefit from a more thorough revamp of the ref namespace, one that would allow a straightforward naming of _any_ kind of remote-tracking ref (heads, tags, notes, whatever). The scheme I have proposed would map refs/kind/name from a remote repo to a remote-tracking refs/remotes/remote/kind/name in the local repo. Having said that, I have clearly failed to find the time and motivation to follow through on this topic, and although there was some support for the idea, nobody else has stepped up to tackle it. Unfortunately, that has left git notes in a sorry state when it comes to sharing and collaboration. This has to stop. Fixing notes sharing is much more important than whatever lofty ideas I might have about how things should ideally be organized. Therefore, you can count me in support of organizing remote-tracking notes refs under refs/remote-notes/remote/name. In case of a more thorough redesign of the ref namespace at some point in the future, we will have to deal with a lot of legacy anyway, and adding refs/remote-notes/remote will not considerably increase that burden. Assuming that this is we all agree to go in that direction, let's make a list of things to be done to codify it, and do them. For a starter, I think these are needed, perhaps? - This patch (or an enhancement to keep some safety) - Documentation updates to git notes - Documentation updates to Documentation/gitrepository-layout.txt - Update to git clone and git remote add to add a fetch refspec refs/notes:refs/remote-refs/remote/* - New tests you suggest Sounds good to me. At least that would get us to the point where a simple git fetch will also fetch notes updates, and you can then choose to git notes merge them into your corresponding local notes refs. In addition to that we might want to consider streamlining things further by having a single command (like git pull) that performs both fetching and merging. A complication here is that - unlike the branch realm where HEAD points to our current branch - there is not really a concept of a current notes ref, which could specify _which_ remote-notes ref to merge and/or the parameters of that merge. However, (as usual) I'm getting ahead of myself here. The points you list above go more than halfway to making notes sharing straightforward,
