* Re: Alles wird Git, Berlin, Oct 3rd, 2009
From: Pau Garcia i Quiles @ 2009-09-25 21:29 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: git
In-Reply-To: <alpine.DEB.1.00.0909250810270.4985@pacific.mpi-cbg.de>
Hello,
Sorry if I'm asking something obvious but, what's the
"offical"language of Gittogether Europe ? English ? German ?
On Fri, Sep 25, 2009 at 8:19 AM, Johannes Schindelin
<Johannes.Schindelin@gmx.de> wrote:
> Hi,
>
> as some of you already know, I will be unable to Git Together with other
> Gits in California this year. So the only version of such a Git Together
> I will have this year is the Berlin one.
>
> Details: it will take place on October 3rd, 2009, at the Zuse-Institut
> Berlin: http://www.zib.de/besucher/index.en.html (graciously offered by
> Steffen Prohaska).
>
> We will have a room with fast internet connection and a beamer.
>
> As for the schedule: I had something like this in mind:
>
> 10:00 Saying hello to everybody
> 10:30 Dscho says something about the history of msysGit
> 11:00 Somebody else talks about something else
> 11:30 ...
> ...
>
> After the talks, maybe a little hackathon-style coding (I know what I
> would like to implement, but let's just see what happens).
>
> In the evening, we probably order pizza or go to a restaurant nearby.
>
> See also http://git.or.cz/gitwiki/GitTogether
>
> Ciao,
> Dscho
>
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
Pau Garcia i Quiles
http://www.elpauer.org
(Due to my workload, I may need 10 days to answer)
^ permalink raw reply
* Re: [JGIT PATCH 7/9] removing eclipse project files
From: Robin Rosenberg @ 2009-09-25 21:21 UTC (permalink / raw)
To: Michael Gaffney; +Cc: Mark Struberg, Douglas Campos, Shawn Spearce, git
In-Reply-To: <4ABCE640.6060102@gmail.com>
fredag 25 september 2009 17:48:16 skrev Michael Gaffney <mr.gaffo@gmail.com>:
> My only real item is that I'd like to have the .* eclipse projects added
> to gitignore so I'm not having to constantly stash mine off to the side
> if I make changes.
Is that so hard? Without Git it's a problem since other tools don't have stash. If you
constantly have your own settings you risk making your changes incompatible
with the official settings in various ways, like different formatting, compiler settings
and so on. If you still want different settings --assume-unchanged may help
somewhat.
-- robin
^ permalink raw reply
* Re: [JGIT PATCH 7/9] removing eclipse project files
From: Robin Rosenberg @ 2009-09-25 21:17 UTC (permalink / raw)
To: Mark Struberg; +Cc: MatthiasSohn, git@vger.kernel.org, spearce@spearce.org
In-Reply-To: <212350.78171.qm@web27802.mail.ukl.yahoo.com>
torsdag 24 september 2009 13:50:11 skrev Mark Struberg <struberg@yahoo.de>:
> Hi Matthias!
>
> the answer is a clear yes and no - a 'jein' for german speaking people like you ;)
>
> yes: we have the same settings for the compiler as used before: jdk 1.5 for source and target. This is exactly what has been taken in the ant build which was used prior to maven.
>
> Please note that the settings in org.eclipse.jdt.core.prefs never had (and must not have) any impact on the created jar!
Not sure what ant files you are referring to here and which jars. The plugins downloadable from jgit.org has been built using PDE build. so some of the .settings should affect the compiler and thus the generated jars.
> and no: currently the very file you mentioned contains a lot more stuff. In fact most of this are only editor settings, preferred formattings etc which has nothing to do with the build per se. Eclipse has the ability to import/export all those settings in a XML file which is version independent. We should go this way and also supply similar setting-files for Idea and NetBeans. But forcing those settings via an internal Eclipse plugin config file is imho bad practice.
That way is awkward and people to import the settings and screw them up in their workspaces. I've made the projects I'm involved use .settings and make different settings mostly a non-issue because everyone gets new
settings automatically as they change. Prior to eclipse 3.3 sharing settings was a big problem, but It's not a big deal nowadays. The most annoying thing is that some settings are not available as project specific settings.
We use 3.3 (well I think the last user dropped it recently), 3.4 and 3.5. I often have to fix up new projects but that is typically a one-time per eclipse project problem. (typically the JRE gets bound to a specific install location).
The .launch files is another story since they change format all the time.
-- robin
^ permalink raw reply
* [PATCH] gitk: Update German translation.
From: Christian Stimming @ 2009-09-25 20:41 UTC (permalink / raw)
To: Paul Mackerras; +Cc: git
Signed-off-by: Christian Stimming <stimming@tuhh.de>
---
po/de.po | 679 +++++++++++++++++++++++++++++++++++---------------------------
1 files changed, 389 insertions(+), 290 deletions(-)
diff --git a/po/de.po b/po/de.po
index 53ef0d6..af7cef8 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: git-gui\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-12 21:55+0200\n"
-"PO-Revision-Date: 2009-05-12 22:18+0200\n"
+"POT-Creation-Date: 2009-09-25 22:22+0200\n"
+"PO-Revision-Date: 2009-09-25 22:39+0200\n"
"Last-Translator: Christian Stimming <stimming@tuhh.de>\n"
"Language-Team: German\n"
"MIME-Version: 1.0\n"
@@ -20,21 +20,21 @@ msgstr ""
msgid "Couldn't get list of unmerged files:"
msgstr "Liste der nicht zusammengeführten Dateien nicht gefunden:"
-#: gitk:268
+#: gitk:269
msgid "Error parsing revisions:"
msgstr "Fehler beim Laden der Versionen:"
-#: gitk:323
+#: gitk:324
msgid "Error executing --argscmd command:"
msgstr "Fehler beim Ausführen des --argscmd-Kommandos:"
-#: gitk:336
+#: gitk:337
msgid "No files selected: --merge specified but no files are unmerged."
msgstr ""
"Keine Dateien ausgewählt: Es wurde --merge angegeben, aber es existieren "
"keine nicht zusammengeführten Dateien."
-#: gitk:339
+#: gitk:340
msgid ""
"No files selected: --merge specified but no unmerged files are within file "
"limit."
@@ -42,290 +42,290 @@ msgstr ""
"Keine Dateien ausgewählt: Es wurde --merge angegeben, aber es sind keine "
"nicht zusammengeführten Dateien in der Dateiauswahl."
-#: gitk:361 gitk:508
+#: gitk:362 gitk:509
msgid "Error executing git log:"
msgstr "Fehler beim Ausführen von »git log«:"
-#: gitk:379 gitk:524
+#: gitk:380 gitk:525
msgid "Reading"
msgstr "Lesen"
-#: gitk:439 gitk:4061
+#: gitk:440 gitk:4131
msgid "Reading commits..."
msgstr "Versionen werden gelesen ..."
-#: gitk:442 gitk:1560 gitk:4064
+#: gitk:443 gitk:1561 gitk:4134
msgid "No commits selected"
msgstr "Keine Versionen ausgewählt"
-#: gitk:1436
+#: gitk:1437
msgid "Can't parse git log output:"
msgstr "Ausgabe von »git log« kann nicht erkannt werden:"
-#: gitk:1656
+#: gitk:1657
msgid "No commit information available"
msgstr "Keine Versionsinformation verfügbar"
-#: gitk:1791 gitk:1815 gitk:3854 gitk:8714 gitk:10250 gitk:10422
+#: gitk:1793 gitk:1817 gitk:3924 gitk:8822 gitk:10358 gitk:10534
msgid "OK"
msgstr "Ok"
-#: gitk:1817 gitk:3856 gitk:8311 gitk:8385 gitk:8495 gitk:8544 gitk:8716
-#: gitk:10251 gitk:10423
+#: gitk:1819 gitk:3926 gitk:8419 gitk:8493 gitk:8603 gitk:8652 gitk:8824
+#: gitk:10359 gitk:10535
msgid "Cancel"
msgstr "Abbrechen"
-#: gitk:1917
+#: gitk:1919
msgid "Update"
msgstr "Aktualisieren"
-#: gitk:1918
+#: gitk:1920
msgid "Reload"
msgstr "Neu laden"
-#: gitk:1919
+#: gitk:1921
msgid "Reread references"
msgstr "Zweige neu laden"
-#: gitk:1920
+#: gitk:1922
msgid "List references"
msgstr "Zweige/Markierungen auflisten"
-#: gitk:1922
+#: gitk:1924
msgid "Start git gui"
msgstr "»git gui« starten"
-#: gitk:1924
+#: gitk:1926
msgid "Quit"
msgstr "Beenden"
-#: gitk:1916
+#: gitk:1918
msgid "File"
msgstr "Datei"
-#: gitk:1928
+#: gitk:1930
msgid "Preferences"
msgstr "Einstellungen"
-#: gitk:1927
+#: gitk:1929
msgid "Edit"
msgstr "Bearbeiten"
-#: gitk:1932
+#: gitk:1934
msgid "New view..."
msgstr "Neue Ansicht ..."
-#: gitk:1933
+#: gitk:1935
msgid "Edit view..."
msgstr "Ansicht bearbeiten ..."
-#: gitk:1934
+#: gitk:1936
msgid "Delete view"
msgstr "Ansicht entfernen"
-#: gitk:1936
+#: gitk:1938
msgid "All files"
msgstr "Alle Dateien"
-#: gitk:1931 gitk:3666
+#: gitk:1933 gitk:3678
msgid "View"
msgstr "Ansicht"
-#: gitk:1941 gitk:1951 gitk:2650
+#: gitk:1943 gitk:1953 gitk:2655
msgid "About gitk"
msgstr "Über gitk"
-#: gitk:1942 gitk:1956
+#: gitk:1944 gitk:1958
msgid "Key bindings"
msgstr "Tastenkürzel"
-#: gitk:1940 gitk:1955
+#: gitk:1942 gitk:1957
msgid "Help"
msgstr "Hilfe"
-#: gitk:2016
+#: gitk:2018
msgid "SHA1 ID: "
msgstr "SHA1:"
-#: gitk:2047
+#: gitk:2049
msgid "Row"
msgstr "Zeile"
-#: gitk:2078
+#: gitk:2080
msgid "Find"
msgstr "Suche"
-#: gitk:2079
+#: gitk:2081
msgid "next"
msgstr "nächste"
-#: gitk:2080
+#: gitk:2082
msgid "prev"
msgstr "vorige"
-#: gitk:2081
+#: gitk:2083
msgid "commit"
msgstr "Version nach"
-#: gitk:2084 gitk:2086 gitk:4222 gitk:4245 gitk:4269 gitk:6210 gitk:6282
-#: gitk:6366
+#: gitk:2086 gitk:2088 gitk:4292 gitk:4315 gitk:4339 gitk:6280 gitk:6352
+#: gitk:6436
msgid "containing:"
msgstr "Beschreibung:"
-#: gitk:2087 gitk:3158 gitk:3163 gitk:4297
+#: gitk:2089 gitk:3163 gitk:3168 gitk:4367
msgid "touching paths:"
msgstr "Dateien:"
-#: gitk:2088 gitk:4302
+#: gitk:2090 gitk:4372
msgid "adding/removing string:"
msgstr "Änderungen:"
-#: gitk:2097 gitk:2099
+#: gitk:2099 gitk:2101
msgid "Exact"
msgstr "Exakt"
-#: gitk:2099 gitk:4377 gitk:6178
+#: gitk:2101 gitk:4447 gitk:6248
msgid "IgnCase"
msgstr "Kein Groß/Klein"
-#: gitk:2099 gitk:4271 gitk:4375 gitk:6174
+#: gitk:2101 gitk:4341 gitk:4445 gitk:6244
msgid "Regexp"
msgstr "Regexp"
-#: gitk:2101 gitk:2102 gitk:4396 gitk:4426 gitk:4433 gitk:6302 gitk:6370
+#: gitk:2103 gitk:2104 gitk:4466 gitk:4496 gitk:4503 gitk:6372 gitk:6440
msgid "All fields"
msgstr "Alle Felder"
-#: gitk:2102 gitk:4394 gitk:4426 gitk:6241
+#: gitk:2104 gitk:4464 gitk:4496 gitk:6311
msgid "Headline"
msgstr "Überschrift"
-#: gitk:2103 gitk:4394 gitk:6241 gitk:6370 gitk:6804
+#: gitk:2105 gitk:4464 gitk:6311 gitk:6440 gitk:6874
msgid "Comments"
msgstr "Beschreibung"
-#: gitk:2103 gitk:4394 gitk:4398 gitk:4433 gitk:6241 gitk:6739 gitk:7991
-#: gitk:8006
+#: gitk:2105 gitk:4464 gitk:4468 gitk:4503 gitk:6311 gitk:6809 gitk:8071
+#: gitk:8086
msgid "Author"
msgstr "Autor"
-#: gitk:2103 gitk:4394 gitk:6241 gitk:6741
+#: gitk:2105 gitk:4464 gitk:6311 gitk:6811
msgid "Committer"
msgstr "Eintragender"
-#: gitk:2132
+#: gitk:2134
msgid "Search"
msgstr "Suchen"
-#: gitk:2139
+#: gitk:2141
msgid "Diff"
msgstr "Vergleich"
-#: gitk:2141
+#: gitk:2143
msgid "Old version"
msgstr "Alte Version"
-#: gitk:2143
+#: gitk:2145
msgid "New version"
msgstr "Neue Version"
-#: gitk:2145
+#: gitk:2147
msgid "Lines of context"
msgstr "Kontextzeilen"
-#: gitk:2155
+#: gitk:2157
msgid "Ignore space change"
msgstr "Leerzeichenänderungen ignorieren"
-#: gitk:2213
+#: gitk:2215
msgid "Patch"
msgstr "Patch"
-#: gitk:2215
+#: gitk:2217
msgid "Tree"
msgstr "Baum"
-#: gitk:2359 gitk:2376
+#: gitk:2361 gitk:2378
msgid "Diff this -> selected"
msgstr "Vergleich: diese -> gewählte"
-#: gitk:2360 gitk:2377
+#: gitk:2362 gitk:2379
msgid "Diff selected -> this"
msgstr "Vergleich: gewählte -> diese"
-#: gitk:2361 gitk:2378
+#: gitk:2363 gitk:2380
msgid "Make patch"
msgstr "Patch erstellen"
-#: gitk:2362 gitk:8369
+#: gitk:2364 gitk:8477
msgid "Create tag"
msgstr "Markierung erstellen"
-#: gitk:2363 gitk:8475
+#: gitk:2365 gitk:8583
msgid "Write commit to file"
msgstr "Version in Datei schreiben"
-#: gitk:2364 gitk:8532
+#: gitk:2366 gitk:8640
msgid "Create new branch"
msgstr "Neuen Zweig erstellen"
-#: gitk:2365
+#: gitk:2367
msgid "Cherry-pick this commit"
msgstr "Diese Version pflücken"
-#: gitk:2366
+#: gitk:2368
msgid "Reset HEAD branch to here"
msgstr "HEAD-Zweig auf diese Version zurücksetzen"
-#: gitk:2367
+#: gitk:2369
msgid "Mark this commit"
msgstr "Lesezeichen setzen"
-#: gitk:2368
+#: gitk:2370
msgid "Return to mark"
msgstr "Zum Lesezeichen"
-#: gitk:2369
+#: gitk:2371
msgid "Find descendant of this and mark"
msgstr "Abkömmling von Lesezeichen und dieser Version finden"
-#: gitk:2370
+#: gitk:2372
msgid "Compare with marked commit"
msgstr "Mit Lesezeichen vergleichen"
-#: gitk:2384
+#: gitk:2386
msgid "Check out this branch"
msgstr "Auf diesen Zweig umstellen"
-#: gitk:2385
+#: gitk:2387
msgid "Remove this branch"
msgstr "Zweig löschen"
-#: gitk:2392
+#: gitk:2394
msgid "Highlight this too"
msgstr "Diesen auch hervorheben"
-#: gitk:2393
+#: gitk:2395
msgid "Highlight this only"
msgstr "Nur diesen hervorheben"
-#: gitk:2394
+#: gitk:2396
msgid "External diff"
msgstr "Externes Diff-Programm"
-#: gitk:2395
+#: gitk:2397
msgid "Blame parent commit"
msgstr "Annotieren der Elternversion"
-#: gitk:2402
+#: gitk:2404
msgid "Show origin of this line"
msgstr "Herkunft dieser Zeile anzeigen"
-#: gitk:2403
+#: gitk:2405
msgid "Run git gui blame on this line"
msgstr "Diese Zeile annotieren (»git gui blame«)"
-#: gitk:2652
+#: gitk:2657
msgid ""
"\n"
"Gitk - a commit viewer for git\n"
@@ -342,419 +342,502 @@ msgstr ""
"Benutzung und Weiterverbreitung gemäß den Bedingungen der GNU General Public "
"License"
-#: gitk:2660 gitk:2722 gitk:8897
+#: gitk:2665 gitk:2727 gitk:9005
msgid "Close"
msgstr "Schließen"
-#: gitk:2679
+#: gitk:2684
msgid "Gitk key bindings"
msgstr "Gitk-Tastaturbelegung"
-#: gitk:2682
+#: gitk:2687
msgid "Gitk key bindings:"
msgstr "Gitk-Tastaturbelegung:"
-#: gitk:2684
+#: gitk:2689
#, tcl-format
msgid "<%s-Q>\t\tQuit"
msgstr "<%s-Q>\t\tBeenden"
-#: gitk:2685
+#: gitk:2690
msgid "<Home>\t\tMove to first commit"
msgstr "<Pos1>\t\tZur neuesten Version springen"
-#: gitk:2686
+#: gitk:2691
msgid "<End>\t\tMove to last commit"
msgstr "<Ende>\t\tZur ältesten Version springen"
-#: gitk:2687
+#: gitk:2692
msgid "<Up>, p, i\tMove up one commit"
msgstr "<Hoch>, p, i\tNächste neuere Version"
-#: gitk:2688
+#: gitk:2693
msgid "<Down>, n, k\tMove down one commit"
msgstr "<Runter>, n, k\tNächste ältere Version"
-#: gitk:2689
+#: gitk:2694
msgid "<Left>, z, j\tGo back in history list"
msgstr "<Links>, z, j\tEine Version zurückgehen"
-#: gitk:2690
+#: gitk:2695
msgid "<Right>, x, l\tGo forward in history list"
msgstr "<Rechts>, x, l\tEine Version weitergehen"
-#: gitk:2691
+#: gitk:2696
msgid "<PageUp>\tMove up one page in commit list"
msgstr "<BildHoch>\tEine Seite nach oben blättern"
-#: gitk:2692
+#: gitk:2697
msgid "<PageDown>\tMove down one page in commit list"
msgstr "<BildRunter>\tEine Seite nach unten blättern"
-#: gitk:2693
+#: gitk:2698
#, tcl-format
msgid "<%s-Home>\tScroll to top of commit list"
msgstr "<%s-Pos1>\tZum oberen Ende der Versionsliste blättern"
-#: gitk:2694
+#: gitk:2699
#, tcl-format
msgid "<%s-End>\tScroll to bottom of commit list"
msgstr "<%s-Ende>\tZum unteren Ende der Versionsliste blättern"
-#: gitk:2695
+#: gitk:2700
#, tcl-format
msgid "<%s-Up>\tScroll commit list up one line"
msgstr "<%s-Hoch>\tVersionsliste eine Zeile nach oben blättern"
-#: gitk:2696
+#: gitk:2701
#, tcl-format
msgid "<%s-Down>\tScroll commit list down one line"
msgstr "<%s-Runter>\tVersionsliste eine Zeile nach unten blättern"
-#: gitk:2697
+#: gitk:2702
#, tcl-format
msgid "<%s-PageUp>\tScroll commit list up one page"
msgstr "<%s-BildHoch>\tVersionsliste eine Seite nach oben blättern"
-#: gitk:2698
+#: gitk:2703
#, tcl-format
msgid "<%s-PageDown>\tScroll commit list down one page"
msgstr "<%s-BildRunter>\tVersionsliste eine Seite nach unten blättern"
-#: gitk:2699
+#: gitk:2704
msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
msgstr "<Umschalt-Hoch>\tRückwärts suchen (nach oben; neuere Versionen)"
-#: gitk:2700
+#: gitk:2705
msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
msgstr "<Umschalt-Runter> Suchen (nach unten; ältere Versionen)"
-#: gitk:2701
+#: gitk:2706
msgid "<Delete>, b\tScroll diff view up one page"
msgstr "<Entf>, b\t\tVergleich eine Seite nach oben blättern"
-#: gitk:2702
+#: gitk:2707
msgid "<Backspace>\tScroll diff view up one page"
msgstr "<Löschtaste>\tVergleich eine Seite nach oben blättern"
-#: gitk:2703
+#: gitk:2708
msgid "<Space>\t\tScroll diff view down one page"
msgstr "<Leertaste>\tVergleich eine Seite nach unten blättern"
-#: gitk:2704
+#: gitk:2709
msgid "u\t\tScroll diff view up 18 lines"
msgstr "u\t\tVergleich um 18 Zeilen nach oben blättern"
-#: gitk:2705
+#: gitk:2710
msgid "d\t\tScroll diff view down 18 lines"
msgstr "d\t\tVergleich um 18 Zeilen nach unten blättern"
-#: gitk:2706
+#: gitk:2711
#, tcl-format
msgid "<%s-F>\t\tFind"
msgstr "<%s-F>\t\tSuchen"
-#: gitk:2707
+#: gitk:2712
#, tcl-format
msgid "<%s-G>\t\tMove to next find hit"
msgstr "<%s-G>\t\tWeitersuchen"
-#: gitk:2708
+#: gitk:2713
msgid "<Return>\tMove to next find hit"
msgstr "<Eingabetaste>\tWeitersuchen"
-#: gitk:2709
+#: gitk:2714
msgid "/\t\tFocus the search box"
msgstr "/\t\tTastaturfokus ins Suchfeld"
-#: gitk:2710
+#: gitk:2715
msgid "?\t\tMove to previous find hit"
msgstr "?\t\tRückwärts weitersuchen"
-#: gitk:2711
+#: gitk:2716
msgid "f\t\tScroll diff view to next file"
msgstr "f\t\tVergleich zur nächsten Datei blättern"
-#: gitk:2712
+#: gitk:2717
#, tcl-format
msgid "<%s-S>\t\tSearch for next hit in diff view"
msgstr "<%s-S>\t\tWeitersuchen im Vergleich"
-#: gitk:2713
+#: gitk:2718
#, tcl-format
msgid "<%s-R>\t\tSearch for previous hit in diff view"
msgstr "<%s-R>\t\tRückwärts weitersuchen im Vergleich"
-#: gitk:2714
+#: gitk:2719
#, tcl-format
msgid "<%s-KP+>\tIncrease font size"
msgstr "<%s-Nummerblock-Plus>\tSchrift vergrößern"
-#: gitk:2715
+#: gitk:2720
#, tcl-format
msgid "<%s-plus>\tIncrease font size"
msgstr "<%s-Plus>\tSchrift vergrößern"
-#: gitk:2716
+#: gitk:2721
#, tcl-format
msgid "<%s-KP->\tDecrease font size"
msgstr "<%s-Nummernblock-Minus> Schrift verkleinern"
-#: gitk:2717
+#: gitk:2722
#, tcl-format
msgid "<%s-minus>\tDecrease font size"
msgstr "<%s-Minus>\tSchrift verkleinern"
-#: gitk:2718
+#: gitk:2723
msgid "<F5>\t\tUpdate"
msgstr "<F5>\t\tAktualisieren"
-#: gitk:3173
-#, tcl-format
-msgid "Error getting \"%s\" from %s:"
-msgstr "Fehler beim Holen von »%s« von »%s«:"
-
-#: gitk:3230 gitk:3239
+#: gitk:3178 gitk:3187
#, tcl-format
msgid "Error creating temporary directory %s:"
msgstr "Fehler beim Erzeugen des temporären Verzeichnisses »%s«:"
-#: gitk:3251
+#: gitk:3200
+#, tcl-format
+msgid "Error getting \"%s\" from %s:"
+msgstr "Fehler beim Holen von »%s« von »%s«:"
+
+#: gitk:3263
msgid "command failed:"
msgstr "Kommando fehlgeschlagen:"
-#: gitk:3397
+#: gitk:3409
msgid "No such commit"
msgstr "Version nicht gefunden"
-#: gitk:3411
+#: gitk:3423
msgid "git gui blame: command failed:"
msgstr "git gui blame: Kommando fehlgeschlagen:"
-#: gitk:3442
+#: gitk:3454
#, tcl-format
msgid "Couldn't read merge head: %s"
msgstr "Zusammenführungs-Spitze konnte nicht gelesen werden: %s"
-#: gitk:3450
+#: gitk:3462
#, tcl-format
msgid "Error reading index: %s"
msgstr "Fehler beim Lesen der Bereitstellung (»index«): %s"
-#: gitk:3475
+#: gitk:3487
#, tcl-format
msgid "Couldn't start git blame: %s"
msgstr "»git blame« konnte nicht gestartet werden: %s"
-#: gitk:3478 gitk:6209
+#: gitk:3490 gitk:6279
msgid "Searching"
msgstr "Suchen"
-#: gitk:3510
+#: gitk:3522
#, tcl-format
msgid "Error running git blame: %s"
msgstr "Fehler beim Ausführen von »git blame«: %s"
-#: gitk:3538
+#: gitk:3550
#, tcl-format
msgid "That line comes from commit %s, which is not in this view"
msgstr ""
"Diese Zeile stammt aus Version %s, die nicht in dieser Ansicht gezeigt wird"
-#: gitk:3552
+#: gitk:3564
msgid "External diff viewer failed:"
msgstr "Externes Diff-Programm fehlgeschlagen:"
-#: gitk:3670
+#: gitk:3682
msgid "Gitk view definition"
msgstr "Gitk-Ansichten"
-#: gitk:3674
+#: gitk:3686
msgid "Remember this view"
msgstr "Diese Ansicht speichern"
-#: gitk:3675
-msgid "Commits to include (arguments to git log):"
-msgstr "Versionen anzeigen (Argumente von git log):"
+#: gitk:3687
+msgid "References (space separated list):"
+msgstr "Zweige/Markierungen (durch Leerzeichen getrennte Liste):"
-#: gitk:3676
-msgid "Use all refs"
-msgstr "Alle Zweige verwenden"
+#: gitk:3688
+msgid "Branches & tags:"
+msgstr "Zweige/Markierungen:"
-#: gitk:3677
-msgid "Strictly sort by date"
-msgstr "Streng nach Datum sortieren"
+#: gitk:3689
+msgid "All refs"
+msgstr "Alle Markierungen und Zweige"
-#: gitk:3678
-msgid "Mark branch sides"
-msgstr "Zweig-Seiten markieren"
+#: gitk:3690
+msgid "All (local) branches"
+msgstr "Alle (lokalen) Zweige"
-#: gitk:3679
-msgid "Since date:"
-msgstr "Von Datum:"
+#: gitk:3691
+msgid "All tags"
+msgstr "Alle Markierungen"
-#: gitk:3680
-msgid "Until date:"
-msgstr "Bis Datum:"
+#: gitk:3692
+msgid "All remote-tracking branches"
+msgstr "Alle Übernahmezweige"
-#: gitk:3681
-msgid "Max count:"
-msgstr "Max. Anzahl:"
+#: gitk:3693
+msgid "Commit Info (regular expressions):"
+msgstr "Versionsinformationen (reguläre Ausdrücke):"
-#: gitk:3682
-msgid "Skip:"
+#: gitk:3694
+msgid "Author:"
+msgstr "Autor:"
+
+#: gitk:3695
+msgid "Committer:"
+msgstr "Eintragender:"
+
+#: gitk:3696
+msgid "Commit Message:"
+msgstr "Versionsbeschreibung:"
+
+#: gitk:3697
+msgid "Matches all Commit Info criteria"
+msgstr "Alle Versionsinformationen-Kriterien erfüllen"
+
+#: gitk:3698
+msgid "Changes to Files:"
+msgstr "Dateien:"
+
+#: gitk:3699
+msgid "Fixed String"
+msgstr "Zeichenkette"
+
+#: gitk:3700
+msgid "Regular Expression"
+msgstr "Regulärer Ausdruck"
+
+#: gitk:3701
+msgid "Search string:"
+msgstr "Suchausdruck:"
+
+#: gitk:3702
+msgid ""
+"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
+"15:27:38\"):"
+msgstr "Datum (»2 weeks ago«, »2009-03-17 15:27:38«, »March 17, 2009 15:27:38«)"
+
+#: gitk:3703
+msgid "Since:"
+msgstr "Von:"
+
+#: gitk:3704
+msgid "Until:"
+msgstr "Bis:"
+
+#: gitk:3705
+msgid "Limit and/or skip a number of revisions (positive integer):"
+msgstr "Versionsanzahl begrenzen oder einige überspringen (ganzzahliger Wert):"
+
+#: gitk:3706
+msgid "Number to show:"
+msgstr "Anzeigen:"
+
+#: gitk:3707
+msgid "Number to skip:"
msgstr "Überspringen:"
-#: gitk:3683
+#: gitk:3708
+msgid "Miscellaneous options:"
+msgstr "Sonstiges:"
+
+#: gitk:3709
+msgid "Strictly sort by date"
+msgstr "Streng nach Datum sortieren"
+
+#: gitk:3710
+msgid "Mark branch sides"
+msgstr "Zweig-Seiten markieren"
+
+#: gitk:3711
msgid "Limit to first parent"
msgstr "Auf erste Elternversion beschränken"
-#: gitk:3684
+#: gitk:3712
+msgid "Simple history"
+msgstr "Einfache Historie"
+
+#: gitk:3713
+msgid "Additional arguments to git log:"
+msgstr "Zusätzliche Argumente für »git log«:"
+
+#: gitk:3714
+msgid "Enter files and directories to include, one per line:"
+msgstr "Folgende Dateien und Verzeichnisse anzeigen (eine pro Zeile):"
+
+#: gitk:3715
msgid "Command to generate more commits to include:"
msgstr "Versionsliste durch folgendes Kommando erzeugen lassen:"
-#: gitk:3780
+#: gitk:3837
msgid "Gitk: edit view"
msgstr "Gitk: Ansicht bearbeiten"
-#: gitk:3793
-msgid "Name"
-msgstr "Name"
+#: gitk:3845
+msgid "-- criteria for selecting revisions"
+msgstr "-- Auswahl der angezeigten Versionen"
-#: gitk:3841
-msgid "Enter files and directories to include, one per line:"
-msgstr "Folgende Dateien und Verzeichnisse anzeigen (eine pro Zeile):"
+#: gitk:3850
+msgid "View Name:"
+msgstr "Ansichtsname:"
-#: gitk:3855
+#: gitk:3925
msgid "Apply (F5)"
msgstr "Anwenden (F5)"
-#: gitk:3893
+#: gitk:3963
msgid "Error in commit selection arguments:"
msgstr "Fehler in den ausgewählten Versionen:"
-#: gitk:3946 gitk:3998 gitk:4446 gitk:4460 gitk:5721 gitk:11114 gitk:11115
+#: gitk:4016 gitk:4068 gitk:4516 gitk:4530 gitk:5791 gitk:11232 gitk:11233
msgid "None"
msgstr "Keine"
-#: gitk:4394 gitk:6241 gitk:7993 gitk:8008
+#: gitk:4464 gitk:6311 gitk:8073 gitk:8088
msgid "Date"
msgstr "Datum"
-#: gitk:4394 gitk:6241
+#: gitk:4464 gitk:6311
msgid "CDate"
msgstr "Eintragedatum"
-#: gitk:4543 gitk:4548
+#: gitk:4613 gitk:4618
msgid "Descendant"
msgstr "Abkömmling"
-#: gitk:4544
+#: gitk:4614
msgid "Not descendant"
msgstr "Kein Abkömmling"
-#: gitk:4551 gitk:4556
+#: gitk:4621 gitk:4626
msgid "Ancestor"
msgstr "Vorgänger"
-#: gitk:4552
+#: gitk:4622
msgid "Not ancestor"
msgstr "Kein Vorgänger"
-#: gitk:4842
+#: gitk:4912
msgid "Local changes checked in to index but not committed"
msgstr "Lokale Änderungen bereitgestellt, aber nicht eingetragen"
-#: gitk:4878
+#: gitk:4948
msgid "Local uncommitted changes, not checked in to index"
msgstr "Lokale Änderungen, nicht bereitgestellt"
-#: gitk:6559
+#: gitk:6629
msgid "many"
msgstr "viele"
-#: gitk:6743
+#: gitk:6813
msgid "Tags:"
msgstr "Markierungen:"
-#: gitk:6760 gitk:6766 gitk:7986
+#: gitk:6830 gitk:6836 gitk:8066
msgid "Parent"
msgstr "Eltern"
-#: gitk:6771
+#: gitk:6841
msgid "Child"
msgstr "Kind"
-#: gitk:6780
+#: gitk:6850
msgid "Branch"
msgstr "Zweig"
-#: gitk:6783
+#: gitk:6853
msgid "Follows"
msgstr "Folgt auf"
-#: gitk:6786
+#: gitk:6856
msgid "Precedes"
msgstr "Vorgänger von"
-#: gitk:7279
+#: gitk:7354
#, tcl-format
msgid "Error getting diffs: %s"
msgstr "Fehler beim Laden des Vergleichs: %s"
-#: gitk:7819
+#: gitk:7894
msgid "Goto:"
msgstr "Gehe zu:"
-#: gitk:7821
+#: gitk:7896
msgid "SHA1 ID:"
msgstr "SHA1-Hashwert:"
-#: gitk:7840
+#: gitk:7915
#, tcl-format
msgid "Short SHA1 id %s is ambiguous"
msgstr "Kurzer SHA1-Hashwert »%s« ist mehrdeutig"
-#: gitk:7852
+#: gitk:7922
+#, tcl-format
+msgid "Revision %s is not known"
+msgstr "Version »%s« ist unbekannt"
+
+#: gitk:7932
#, tcl-format
msgid "SHA1 id %s is not known"
msgstr "SHA1-Hashwert »%s« ist unbekannt"
-#: gitk:7854
+#: gitk:7934
#, tcl-format
-msgid "Tag/Head %s is not known"
-msgstr "Markierung/Zweig »%s« ist unbekannt"
+msgid "Revision %s is not in the current view"
+msgstr "Version »%s« wird in der aktuellen Ansicht nicht angezeigt"
-#: gitk:7996
+#: gitk:8076
msgid "Children"
msgstr "Kinder"
-#: gitk:8053
+#: gitk:8133
#, tcl-format
msgid "Reset %s branch to here"
msgstr "Zweig »%s« hierher zurücksetzen"
-#: gitk:8055
+#: gitk:8135
msgid "Detached head: can't reset"
msgstr "Zweigspitze ist abgetrennt: Zurücksetzen nicht möglich"
-#: gitk:8164 gitk:8170
+#: gitk:8244 gitk:8250
msgid "Skipping merge commit "
msgstr "Überspringe Zusammenführungs-Version "
-#: gitk:8179 gitk:8184
+#: gitk:8259 gitk:8264
msgid "Error getting patch ID for "
msgstr "Fehler beim Holen der Patch-ID für "
-#: gitk:8180 gitk:8185
+#: gitk:8260 gitk:8265
msgid " - stopping\n"
msgstr " - Abbruch.\n"
-#: gitk:8190 gitk:8193 gitk:8201 gitk:8211 gitk:8220
+#: gitk:8270 gitk:8273 gitk:8281 gitk:8294 gitk:8303
msgid "Commit "
msgstr "Version "
-#: gitk:8194
+#: gitk:8274
msgid ""
" is the same patch as\n"
" "
@@ -762,7 +845,7 @@ msgstr ""
" ist das gleiche Patch wie\n"
" "
-#: gitk:8202
+#: gitk:8282
msgid ""
" differs from\n"
" "
@@ -770,117 +853,129 @@ msgstr ""
" ist unterschiedlich von\n"
" "
-#: gitk:8204
-msgid "- stopping\n"
-msgstr "- Abbruch.\n"
+#: gitk:8284
+msgid ""
+"Diff of commits:\n"
+"\n"
+msgstr "Vergleich der Versionen:\n\n"
-#: gitk:8212 gitk:8221
+#: gitk:8295 gitk:8304
#, tcl-format
msgid " has %s children - stopping\n"
msgstr " hat %s Kinder. Abbruch\n"
-#: gitk:8252
+#: gitk:8324
+#, tcl-format
+msgid "Error writing commit to file: %s"
+msgstr "Fehler beim Schreiben der Version in Datei: %s"
+
+#: gitk:8330
+#, tcl-format
+msgid "Error diffing commits: %s"
+msgstr "Fehler beim Vergleichen der Versionen: %s"
+
+#: gitk:8360
msgid "Top"
msgstr "Oben"
-#: gitk:8253
+#: gitk:8361
msgid "From"
msgstr "Von"
-#: gitk:8258
+#: gitk:8366
msgid "To"
msgstr "bis"
-#: gitk:8282
+#: gitk:8390
msgid "Generate patch"
msgstr "Patch erstellen"
-#: gitk:8284
+#: gitk:8392
msgid "From:"
msgstr "Von:"
-#: gitk:8293
+#: gitk:8401
msgid "To:"
msgstr "bis:"
-#: gitk:8302
+#: gitk:8410
msgid "Reverse"
msgstr "Umgekehrt"
-#: gitk:8304 gitk:8489
+#: gitk:8412 gitk:8597
msgid "Output file:"
msgstr "Ausgabedatei:"
-#: gitk:8310
+#: gitk:8418
msgid "Generate"
msgstr "Erzeugen"
-#: gitk:8348
+#: gitk:8456
msgid "Error creating patch:"
msgstr "Fehler beim Erzeugen des Patches:"
-#: gitk:8371 gitk:8477 gitk:8534
+#: gitk:8479 gitk:8585 gitk:8642
msgid "ID:"
msgstr "ID:"
-#: gitk:8380
+#: gitk:8488
msgid "Tag name:"
msgstr "Markierungsname:"
-#: gitk:8384 gitk:8543
+#: gitk:8492 gitk:8651
msgid "Create"
msgstr "Erstellen"
-#: gitk:8401
+#: gitk:8509
msgid "No tag name specified"
msgstr "Kein Markierungsname angegeben"
-#: gitk:8405
+#: gitk:8513
#, tcl-format
msgid "Tag \"%s\" already exists"
msgstr "Markierung »%s« existiert bereits."
-#: gitk:8411
+#: gitk:8519
msgid "Error creating tag:"
msgstr "Fehler beim Erstellen der Markierung:"
-#: gitk:8486
+#: gitk:8594
msgid "Command:"
msgstr "Kommando:"
-#: gitk:8494
+#: gitk:8602
msgid "Write"
msgstr "Schreiben"
-#: gitk:8512
+#: gitk:8620
msgid "Error writing commit:"
msgstr "Fehler beim Schreiben der Version:"
-#: gitk:8539
+#: gitk:8647
msgid "Name:"
msgstr "Name:"
-#: gitk:8562
+#: gitk:8670
msgid "Please specify a name for the new branch"
msgstr "Bitte geben Sie einen Namen für den neuen Zweig an."
-#: gitk:8567
+#: gitk:8675
#, tcl-format
msgid "Branch '%s' already exists. Overwrite?"
msgstr "Zweig »%s« existiert bereits. Soll er überschrieben werden?"
-#: gitk:8633
+#: gitk:8741
#, tcl-format
msgid "Commit %s is already included in branch %s -- really re-apply it?"
msgstr ""
"Version »%s« ist bereits im Zweig »%s« enthalten -- trotzdem erneut "
"eintragen?"
-#: gitk:8638
+#: gitk:8746
msgid "Cherry-picking"
msgstr "Version pflücken"
-#: gitk:8647
+#: gitk:8755
#, tcl-format
msgid ""
"Cherry-pick failed because of local changes to file '%s'.\n"
@@ -890,7 +985,7 @@ msgstr ""
"vorliegen. Bitte diese Änderungen eintragen, zurücksetzen oder\n"
"zwischenspeichern (»git stash«) und dann erneut versuchen."
-#: gitk:8653
+#: gitk:8761
msgid ""
"Cherry-pick failed because of merge conflict.\n"
"Do you wish to run git citool to resolve it?"
@@ -899,34 +994,34 @@ msgstr ""
"ist. Soll das Zusammenführungs-Werkzeug (»git citool«) aufgerufen\n"
"werden, um diesen Konflikt aufzulösen?"
-#: gitk:8669
+#: gitk:8777
msgid "No changes committed"
msgstr "Keine Änderungen eingetragen"
-#: gitk:8695
+#: gitk:8803
msgid "Confirm reset"
msgstr "Zurücksetzen bestätigen"
-#: gitk:8697
+#: gitk:8805
#, tcl-format
msgid "Reset branch %s to %s?"
msgstr "Zweig »%s« auf »%s« zurücksetzen?"
-#: gitk:8701
+#: gitk:8809
msgid "Reset type:"
msgstr "Art des Zurücksetzens:"
-#: gitk:8705
+#: gitk:8813
msgid "Soft: Leave working tree and index untouched"
msgstr "Harmlos: Arbeitskopie und Bereitstellung unverändert"
-#: gitk:8708
+#: gitk:8816
msgid "Mixed: Leave working tree untouched, reset index"
msgstr ""
"Gemischt: Arbeitskopie unverändert,\n"
"Bereitstellung zurückgesetzt"
-#: gitk:8711
+#: gitk:8819
msgid ""
"Hard: Reset working tree and index\n"
"(discard ALL local changes)"
@@ -934,21 +1029,21 @@ msgstr ""
"Hart: Arbeitskopie und Bereitstellung\n"
"(Alle lokalen Änderungen werden gelöscht)"
-#: gitk:8728
+#: gitk:8836
msgid "Resetting"
msgstr "Zurücksetzen"
-#: gitk:8785
+#: gitk:8893
msgid "Checking out"
msgstr "Umstellen"
-#: gitk:8838
+#: gitk:8946
msgid "Cannot delete the currently checked-out branch"
msgstr ""
"Der Zweig, auf den die Arbeitskopie momentan umgestellt ist, kann nicht "
"gelöscht werden."
-#: gitk:8844
+#: gitk:8952
#, tcl-format
msgid ""
"The commits on branch %s aren't on any other branch.\n"
@@ -957,16 +1052,16 @@ msgstr ""
"Die Versionen auf Zweig »%s« existieren auf keinem anderen Zweig.\n"
"Zweig »%s« trotzdem löschen?"
-#: gitk:8875
+#: gitk:8983
#, tcl-format
msgid "Tags and heads: %s"
msgstr "Markierungen und Zweige: %s"
-#: gitk:8890
+#: gitk:8998
msgid "Filter"
msgstr "Filtern"
-#: gitk:9185
+#: gitk:9293
msgid ""
"Error reading commit topology information; branch and preceding/following "
"tag information will be incomplete."
@@ -974,157 +1069,161 @@ msgstr ""
"Fehler beim Lesen der Strukturinformationen; Zweige und Informationen zu "
"Vorgänger/Nachfolger werden unvollständig sein."
-#: gitk:10171
+#: gitk:10279
msgid "Tag"
msgstr "Markierung"
-#: gitk:10171
+#: gitk:10279
msgid "Id"
msgstr "Id"
-#: gitk:10219
+#: gitk:10327
msgid "Gitk font chooser"
msgstr "Gitk-Schriften wählen"
-#: gitk:10236
+#: gitk:10344
msgid "B"
msgstr "F"
-#: gitk:10239
+#: gitk:10347
msgid "I"
msgstr "K"
-#: gitk:10334
+#: gitk:10443
msgid "Gitk preferences"
msgstr "Gitk-Einstellungen"
-#: gitk:10336
+#: gitk:10445
msgid "Commit list display options"
msgstr "Anzeige der Versionsliste"
-#: gitk:10339
+#: gitk:10448
msgid "Maximum graph width (lines)"
msgstr "Maximale Graphenbreite (Zeilen)"
-#: gitk:10343
+#: gitk:10452
#, tcl-format
msgid "Maximum graph width (% of pane)"
msgstr "Maximale Graphenbreite (% des Fensters)"
-#: gitk:10347
+#: gitk:10456
msgid "Show local changes"
msgstr "Lokale Änderungen anzeigen"
-#: gitk:10350
+#: gitk:10459
msgid "Auto-select SHA1"
msgstr "SHA1-Hashwert automatisch auswählen"
-#: gitk:10354
+#: gitk:10463
msgid "Diff display options"
msgstr "Anzeige des Vergleichs"
-#: gitk:10356
+#: gitk:10465
msgid "Tab spacing"
msgstr "Tabulatorbreite"
-#: gitk:10359
+#: gitk:10468
msgid "Display nearby tags"
msgstr "Naheliegende Markierungen anzeigen"
-#: gitk:10362
+#: gitk:10471
+msgid "Hide remote refs"
+msgstr "Entfernte Zweige/Markierungen ausblenden"
+
+#: gitk:10474
msgid "Limit diffs to listed paths"
msgstr "Vergleich nur für angezeigte Pfade"
-#: gitk:10365
+#: gitk:10477
msgid "Support per-file encodings"
msgstr "Zeichenkodierung pro Datei ermitteln"
-#: gitk:10371 gitk:10436
+#: gitk:10483 gitk:10548
msgid "External diff tool"
msgstr "Externes Diff-Programm"
-#: gitk:10373
+#: gitk:10485
msgid "Choose..."
msgstr "Wählen ..."
-#: gitk:10378
+#: gitk:10490
msgid "Colors: press to choose"
msgstr "Farben: Klicken zum Wählen"
-#: gitk:10381
+#: gitk:10493
msgid "Background"
msgstr "Hintergrund"
-#: gitk:10382 gitk:10412
+#: gitk:10494 gitk:10524
msgid "background"
msgstr "Hintergrund"
-#: gitk:10385
+#: gitk:10497
msgid "Foreground"
msgstr "Vordergrund"
-#: gitk:10386
+#: gitk:10498
msgid "foreground"
msgstr "Vordergrund"
-#: gitk:10389
+#: gitk:10501
msgid "Diff: old lines"
msgstr "Vergleich: Alte Zeilen"
-#: gitk:10390
+#: gitk:10502
msgid "diff old lines"
msgstr "Vergleich - Alte Zeilen"
-#: gitk:10394
+#: gitk:10506
msgid "Diff: new lines"
msgstr "Vergleich: Neue Zeilen"
-#: gitk:10395
+#: gitk:10507
msgid "diff new lines"
msgstr "Vergleich - Neue Zeilen"
-#: gitk:10399
+#: gitk:10511
msgid "Diff: hunk header"
msgstr "Vergleich: Änderungstitel"
-#: gitk:10401
+#: gitk:10513
msgid "diff hunk header"
msgstr "Vergleich - Änderungstitel"
-#: gitk:10405
+#: gitk:10517
msgid "Marked line bg"
msgstr "Hintergrund für markierte Zeile"
-#: gitk:10407
+#: gitk:10519
msgid "marked line background"
msgstr "Hintergrund für markierte Zeile"
-#: gitk:10411
+#: gitk:10523
msgid "Select bg"
msgstr "Hintergrundfarbe auswählen"
-#: gitk:10415
+#: gitk:10527
msgid "Fonts: press to choose"
msgstr "Schriftart: Klicken zum Wählen"
-#: gitk:10417
+#: gitk:10529
msgid "Main font"
msgstr "Programmschriftart"
-#: gitk:10418
+#: gitk:10530
msgid "Diff display font"
msgstr "Schriftart für Vergleich"
-#: gitk:10419
+#: gitk:10531
msgid "User interface font"
msgstr "Beschriftungen"
-#: gitk:10446
+#: gitk:10558
#, tcl-format
msgid "Gitk: choose color for %s"
msgstr "Gitk: Farbe wählen für %s"
-#: gitk:10893
+#: gitk:11009
msgid ""
"Sorry, gitk cannot run with this version of Tcl/Tk.\n"
" Gitk requires at least Tcl/Tk 8.4."
@@ -1132,24 +1231,24 @@ msgstr ""
"Gitk läuft nicht mit dieser Version von Tcl/Tk.\n"
"Gitk benötigt mindestens Tcl/Tk 8.4."
-#: gitk:11020
+#: gitk:11137
msgid "Cannot find a git repository here."
msgstr "Kein Git-Projektarchiv gefunden."
-#: gitk:11024
+#: gitk:11141
#, tcl-format
msgid "Cannot find the git directory \"%s\"."
msgstr "Git-Verzeichnis »%s« wurde nicht gefunden."
-#: gitk:11071
+#: gitk:11188
#, tcl-format
msgid "Ambiguous argument '%s': both revision and filename"
msgstr "Mehrdeutige Angabe »%s«: Sowohl Version als auch Dateiname existiert."
-#: gitk:11083
+#: gitk:11200
msgid "Bad arguments to gitk:"
msgstr "Falsche Kommandozeilen-Parameter für gitk:"
-#: gitk:11167
+#: gitk:11285
msgid "Command line"
msgstr "Kommandozeile"
--
1.6.1.rc3.51.g5832d
^ permalink raw reply related
* Re: Alles wird Git, Berlin, Oct 3rd, 2009
From: David Soria Parra @ 2009-09-25 21:03 UTC (permalink / raw)
To: git
In-Reply-To: <alpine.DEB.1.00.0909250810270.4985@pacific.mpi-cbg.de>
On 2009-09-25, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> Hi,
>
> as some of you already know, I will be unable to Git Together with other
> Gits in California this year. So the only version of such a Git Together
> I will have this year is the Berlin one.
I'm not able to attend this year, but I would be really great to have a
germany or european based gittogether every year.
David
^ permalink raw reply
* Re: git clone sending unneeded objects
From: Nicolas Pitre @ 2009-09-25 20:47 UTC (permalink / raw)
To: Jason Merrill; +Cc: Matthieu Moy, git, Hin-Tak Leung
In-Reply-To: <4ABD25FE.2040902@redhat.com>
On Fri, 25 Sep 2009, Jason Merrill wrote:
> On 09/25/2009 03:53 PM, Nicolas Pitre wrote:
> > I did reproduce the issue with git:// back when this discussion started.
> > I also asked for more information about the remote which didn't come
> > forth.
>
> Looking back, I only see you asking about the git version on the server, which
> is 1.6.4.
>
> So again:
>
> git clone git://gcc.gnu.org/git/gcc.git
> (1399509 objects, ~600MB .git dir)
> git gc --prune=now (988906 objects, ~450MB .git dir)
>
> ...then
>
> git clone git://gcc.gnu.org/git/gcc.git --reference $firstclone
> (573401 objects, ~550MB .git dir)
> git fsck (clean)
> git gc --prune=now (5 objects, ~7MB .git dir)
>
> What's going on here?
Some screw up.
Do you have access to the remote machine? Is it possible to have a
tarball of the gcc.git directory from there?
Nicolas
^ permalink raw reply
* Re: git clone sending unneeded objects
From: Jason Merrill @ 2009-09-25 20:20 UTC (permalink / raw)
To: Nicolas Pitre; +Cc: Matthieu Moy, git, Hin-Tak Leung
In-Reply-To: <alpine.LFD.2.00.0909251551290.4997@xanadu.home>
On 09/25/2009 03:53 PM, Nicolas Pitre wrote:
> I did reproduce the issue with git:// back when this discussion started.
> I also asked for more information about the remote which didn't come
> forth.
Looking back, I only see you asking about the git version on the server,
which is 1.6.4.
So again:
git clone git://gcc.gnu.org/git/gcc.git
(1399509 objects, ~600MB .git dir)
git gc --prune=now (988906 objects, ~450MB .git dir)
...then
git clone git://gcc.gnu.org/git/gcc.git --reference $firstclone
(573401 objects, ~550MB .git dir)
git fsck (clean)
git gc --prune=now (5 objects, ~7MB .git dir)
What's going on here?
Jason
^ permalink raw reply
* Re: git log --pretty=format:%h prints (unrequired) abbreviated sha
From: Marco Costalba @ 2009-09-25 20:04 UTC (permalink / raw)
To: alexandrul; +Cc: Git Mailing List
In-Reply-To: <4ABD178E.8000508@gmail.com>
On Fri, Sep 25, 2009 at 20:18, alexandrul <alexandrul.ct@gmail.com> wrote:
>
> then check your PATH and the configuration files from your HOME folder (as
> recommended earlier).
>
I have uninstalled git, verified git folder was removed.
I have removed git/cmd from the PATH in Windows and I have removed the
following files from users/marco
.bash_history
.gitconfig
.gitk
I have reinstalled all and it still does not work. There are other
files in HOME that I need to remove ?
^ permalink raw reply
* Re: git clone sending unneeded objects
From: Nicolas Pitre @ 2009-09-25 19:53 UTC (permalink / raw)
To: Matthieu Moy; +Cc: Jason Merrill, git, Hin-Tak Leung
In-Reply-To: <vpqvdj6izt6.fsf@bauges.imag.fr>
On Fri, 25 Sep 2009, Matthieu Moy wrote:
> Jason Merrill <jason@redhat.com> writes:
>
> > On 08/09/2009 03:43 AM, Andreas Schwab wrote:
> >> Nicolas Pitre<nico@cam.org> writes:
> >>
> >>> If you do a clone using the git:// protocol and the server sends you
> >>> only the ref for the trunk branch,
> >>
> >> A clone will fetch all branches from refs/heads/*.
> >>
> >>> then it should send you only objects reachable from that branch.
> >>
> >> Apparantly this does not work. I'd guess the extra objects are needed
> >> due to the delta compression.
> >
> > I just tried doing a clone of the GCC repository, then git gc
> > --prune=now, and another clone specifying --reference to the first,
> > and it wanted to download all the unreachable objects again. So it
> > doesn't seem to be a compression issue.
> >
> > This is with git 1.6.4 on both ends.
>
> Which protocol did you use?
>
> If you use git:// or ssh://, it's normally a security feature that Git
> sends you only reachable objects. If it doesn't, it's a serious bug.
I did reproduce the issue with git:// back when this discussion started.
I also asked for more information about the remote which didn't come
forth.
Nicolas
^ permalink raw reply
* Re: git clone sending unneeded objects
From: Jason Merrill @ 2009-09-25 19:43 UTC (permalink / raw)
To: Matthieu Moy; +Cc: git, Nicolas Pitre, Hin-Tak Leung
In-Reply-To: <vpqvdj6izt6.fsf@bauges.imag.fr>
On 09/25/2009 03:34 PM, Matthieu Moy wrote:
> Which protocol did you use?
git://
Jason
^ permalink raw reply
* Re: git clone sending unneeded objects
From: Matthieu Moy @ 2009-09-25 19:34 UTC (permalink / raw)
To: Jason Merrill; +Cc: git, Nicolas Pitre, Hin-Tak Leung
In-Reply-To: <4ABD0669.7050309@redhat.com>
Jason Merrill <jason@redhat.com> writes:
> On 08/09/2009 03:43 AM, Andreas Schwab wrote:
>> Nicolas Pitre<nico@cam.org> writes:
>>
>>> If you do a clone using the git:// protocol and the server sends you
>>> only the ref for the trunk branch,
>>
>> A clone will fetch all branches from refs/heads/*.
>>
>>> then it should send you only objects reachable from that branch.
>>
>> Apparantly this does not work. I'd guess the extra objects are needed
>> due to the delta compression.
>
> I just tried doing a clone of the GCC repository, then git gc
> --prune=now, and another clone specifying --reference to the first,
> and it wanted to download all the unreachable objects again. So it
> doesn't seem to be a compression issue.
>
> This is with git 1.6.4 on both ends.
Which protocol did you use?
If you use git:// or ssh://, it's normally a security feature that Git
sends you only reachable objects. If it doesn't, it's a serious bug.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
^ permalink raw reply
* Re: git log --pretty=format:%h prints (unrequired) abbreviated sha
From: alexandrul @ 2009-09-25 19:18 UTC (permalink / raw)
To: Marco Costalba; +Cc: Git Mailing List
In-Reply-To: <e5bfff550909251208v68a561beu2d9f21ae2417fdd6@mail.gmail.com>
Marco Costalba wrote:
>> This is a good idea, thanks. I will copy the git folder to a working
>> PC and we will see....
>>
>
> I have copied the whole Git folder to another PC with windows xp.
>
> I have moved the Git directory and all its subfolders under program
> files instead of the old that I have renamed.
>
> And everything worked as expected ! no problem and from git bash I
> verified that the new copied version was running.
>
> I really don't know what to think....
>
then check your PATH and the configuration files from your HOME folder
(as recommended earlier).
Have a nice day,
A.
^ permalink raw reply
* Re: git log --pretty=format:%h prints (unrequired) abbreviated sha
From: Marco Costalba @ 2009-09-25 19:08 UTC (permalink / raw)
To: alexandrul; +Cc: Git Mailing List
In-Reply-To: <e5bfff550909251144ma9e4dccmb54a64f364b820fa@mail.gmail.com>
>
> This is a good idea, thanks. I will copy the git folder to a working
> PC and we will see....
>
I have copied the whole Git folder to another PC with windows xp.
I have moved the Git directory and all its subfolders under program
files instead of the old that I have renamed.
And everything worked as expected ! no problem and from git bash I
verified that the new copied version was running.
I really don't know what to think....
^ permalink raw reply
* Re: 'git branch --no-merge' is ambiguous
From: Andreas Schwab @ 2009-09-25 18:44 UTC (permalink / raw)
To: Johannes Sixt; +Cc: Pierre Habouzit, Git Mailing List
In-Reply-To: <4ABC9B69.5010205@viscovery.net>
Johannes Sixt <j.sixt@viscovery.net> writes:
> Look here:
>
> $ git branch --merge
> * master
> $ git branch --no-merge
> error: Ambiguous option: no-merge (could be --no-merged or --no-merged)
> usage: ...
> --no-merged <commit> print only not merged branches
> --merged <commit> print only merged branches
>
> I tried to debug it, but parse_long_opt() is such awful spaghetti code
> that I don't grok it. Please help.
parse_long_opt always matches both --opt and --no-opt for any option
"opt", and only get_value checks whether --no-opt is actually valid.
Since the options for git branch contains both "no-merged" and "merged"
there are two matches for --no-merge, but no exact match. With this
patch the negation of a NONEG option is rejected earlier, but it changes
the error message from "option `no-opt' isn't available" to "unknown
option `no-opt'".
diff --git a/parse-options.c b/parse-options.c
index a64a4d6..f559411 100644
--- a/parse-options.c
+++ b/parse-options.c
@@ -230,6 +230,9 @@ is_abbreviated:
abbrev_flags = flags;
continue;
}
+ /* negation allowed? */
+ if (options->flags & PARSE_OPT_NONEG)
+ continue;
/* negated and abbreviated very much? */
if (!prefixcmp("no-", arg)) {
flags |= OPT_UNSET;
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
^ permalink raw reply related
* Re: git log --pretty=format:%h prints (unrequired) abbreviated sha
From: Marco Costalba @ 2009-09-25 18:44 UTC (permalink / raw)
To: alexandrul; +Cc: Git Mailing List
In-Reply-To: <4ABD0E90.5030301@gmail.com>
On Fri, Sep 25, 2009 at 19:40, alexandrul <alexandrul.ct@gmail.com> wrote:
>> Now path is C:\Program Files\Git\bin
>>
>> I have even deleted the contents of cmd directory to be sure they were
>> not called.
>>
>> But unfortunatly the problem persists.
>
> Could you copy the git installation folder to another PC and see if the
> problem is still present? Or archive it and upload it on some file sharing
> service?
>
This is a good idea, thanks. I will copy the git folder to a working
PC and we will see....
^ permalink raw reply
* Re: git log --pretty=format:%h prints (unrequired) abbreviated sha
From: alexandrul @ 2009-09-25 18:40 UTC (permalink / raw)
To: Marco Costalba; +Cc: Git Mailing List
In-Reply-To: <e5bfff550909251125t6ed59b1fv953eee597adc4471@mail.gmail.com>
> Now path is C:\Program Files\Git\bin
>
> I have even deleted the contents of cmd directory to be sure they were
> not called.
>
> But unfortunatly the problem persists.
Could you copy the git installation folder to another PC and see if the
problem is still present? Or archive it and upload it on some file
sharing service?
Have a nice day,
A.
^ permalink raw reply
* Re: git log --pretty=format:%h prints (unrequired) abbreviated sha
From: Marco Costalba @ 2009-09-25 18:25 UTC (permalink / raw)
To: Johannes Sixt; +Cc: Git Mailing List
In-Reply-To: <4ABCE167.7060204@viscovery.net>
On Fri, Sep 25, 2009 at 16:27, Johannes Sixt <j.sixt@viscovery.net> wrote:
> Marco Costalba schrieb:
>> On Fri, Sep 25, 2009 at 15:12, Johannes Sixt <j.sixt@viscovery.net> wrote:
>>> Does that work?
>>>
>>
>> No it doesn't.
>>
>> I had already C:\Program Files\Git\cmd in path, probably added by
>> msysgit installation.
>
> The point of the exercise is to not use the git.cmd wrapper. I.e. point
> your path not into C:\Program Files\Git\cmd, but into the bin directories
> so that you run git.exe, not git.cmd.
>
Now path is C:\Program Files\Git\bin
I have even deleted the contents of cmd directory to be sure they were
not called.
But unfortunatly the problem persists.
^ permalink raw reply
* Re: git clone sending unneeded objects (was : git gc expanding packed data?)
From: Jason Merrill @ 2009-09-25 18:05 UTC (permalink / raw)
To: Andreas Schwab; +Cc: Nicolas Pitre, Hin-Tak Leung, git
In-Reply-To: <m2k51dzb39.fsf@linux-m68k.org>
On 08/09/2009 03:43 AM, Andreas Schwab wrote:
> Nicolas Pitre<nico@cam.org> writes:
>
>> If you do a clone using the git:// protocol and the server sends you
>> only the ref for the trunk branch,
>
> A clone will fetch all branches from refs/heads/*.
>
>> then it should send you only objects reachable from that branch.
>
> Apparantly this does not work. I'd guess the extra objects are needed
> due to the delta compression.
I just tried doing a clone of the GCC repository, then git gc
--prune=now, and another clone specifying --reference to the first, and
it wanted to download all the unreachable objects again. So it doesn't
seem to be a compression issue.
This is with git 1.6.4 on both ends.
Jason
^ permalink raw reply
* Enhance your intimate response.
From: Louie Allen @ 2009-09-25 17:59 UTC (permalink / raw)
To: git
100% success with chicks http://il.necksister.com/
^ permalink raw reply
* [PATCH] git-am: force egrep to use correct characters set
From: Christian Himpel @ 2009-09-25 16:43 UTC (permalink / raw)
To: git
In-Reply-To: <215cc4f241162377b9249c2b3d74050cc77bac16.1253893253.git.chressie@gmail.com>
According to egrep(1) the US-ASCII table is used when LC_ALL=C is set.
We do not rely here on the LC_ALL value we get from the environment.
Signed-off-by: Christian Himpel <chressie@gmail.com>
---
sorry for being so noisy, but forgot to signoff last time
git-am.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/git-am.sh b/git-am.sh
index 0ddd80f..c132f50 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -205,7 +205,7 @@ check_patch_format () {
# and see if it looks like that they all begin with the
# header field names...
sed -n -e '/^$/q' -e '/^[ ]/d' -e p "$1" |
- egrep -v '^[!-9;-~]+:' >/dev/null ||
+ LC_ALL=C egrep -v '^[!-9;-~]+:' >/dev/null ||
patch_format=mbox
fi
} < "$1" || clean_abort
--
1.6.4.4
^ permalink raw reply related
* Interim maintainer tree
From: Shawn O. Pearce @ 2009-09-25 16:05 UTC (permalink / raw)
To: git
Junio is on vaction for the next week. In his absence Peff and I
are trying to keep up with current patches in my fork:
git://repo.or.cz/git/spearce.git
http://repo.or.cz/r/git/spearce.git
Right now the tree matches Junio's last push, I'll try to pick up
the patches since then and push later today.
--
Shawn.
^ permalink raw reply
* gitolite update
From: Sitaram Chamarty @ 2009-09-25 15:49 UTC (permalink / raw)
To: git
This is an update on gitolite, the "lite" rewrite of gitosis (in
perl) for a typical "corporate" environment, after a month of
moderately heavy use at my workplace and quite a lot of updates
and improvements (thanks to a lot of people on the list and on
IRC, and colleagues at work). The latest version is at
git://github.com/sitaramc/gitolite.git -- I recommend the
"master" branch for most people.
My original reasons were per-branch permissions, limiting
rewind/non-ff to specific people, and to install on any Unix
with no dependencies and no root access, assuming git itself was
already installed somehow.
Over the past month it acquired some more features/improvements.
There's also oodles of documentation -- this is not one of those
"figure it out yourself" systems :-)
Summary
=======
* simpler, but far more powerful, config file syntax,
including specifying gitweb/daemon access. You'll need this
power if you manage lots of users + repos + combinations of
access
* more comprehensive logging
* "personal namespace" prefix for each dev
* migration guide and simple converter for gitosis conf file
* "exclude" (or "deny" rights in the config file) -- this is
the "rebel" branch in the repository, and always will be ;-)
All these points (and more) are explained in detail at
http://github.com/sitaramc/gitolite/blob/ml/update.mkd (I wasn't
sure if it was OK to post all that to the list; it was a bit
long).
Anyway, if you're looking for features like this, give it a
whirl -- I'd appreciate comments from users or even just people
who read that page and have some thing to say. And needless to
say I'll gladly help anyone having trouble; preferably on #git
but the mailing list or personal email are fine too.
--
Sitaram
sitaramc@gmail.com / sitaram.chamarty@tcs.com
^ permalink raw reply
* Re: [JGIT PATCH 7/9] removing eclipse project files
From: Michael Gaffney @ 2009-09-25 15:48 UTC (permalink / raw)
To: Mark Struberg; +Cc: Douglas Campos, Shawn Spearce, git
In-Reply-To: <891180.68852.qm@web27805.mail.ukl.yahoo.com>
My only real item is that I'd like to have the .* eclipse projects added
to gitignore so I'm not having to constantly stash mine off to the side
if I make changes.
-Mike
^ permalink raw reply
* [PATCH 2/2 v2] git-am: force egrep to use correct characters set
From: Christian Himpel @ 2009-09-25 15:45 UTC (permalink / raw)
To: git
In-Reply-To: <dc8a4205128d65e69587292a42c714792315a9df.1253891124.git.chressie@gmail.com>
According to egrep(1) the US-ASCII table is used when LC_ALL=C is set.
We do not rely here on the LC_ALL value we get from the environment.
---
This is probably a saner approach :)
git-am.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/git-am.sh b/git-am.sh
index 0ddd80f..c132f50 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -205,7 +205,7 @@ check_patch_format () {
# and see if it looks like that they all begin with the
# header field names...
sed -n -e '/^$/q' -e '/^[ ]/d' -e p "$1" |
- egrep -v '^[!-9;-~]+:' >/dev/null ||
+ LC_ALL=C egrep -v '^[!-9;-~]+:' >/dev/null ||
patch_format=mbox
fi
} < "$1" || clean_abort
--
1.6.4.4
^ permalink raw reply related
* Re: git log --pretty=format:%h prints (unrequired) abbreviated sha
From: Johannes Sixt @ 2009-09-25 15:27 UTC (permalink / raw)
To: Marco Costalba; +Cc: Git Mailing List
In-Reply-To: <e5bfff550909250718y51709692kc8d1e2586017341b@mail.gmail.com>
Marco Costalba schrieb:
> On Fri, Sep 25, 2009 at 15:12, Johannes Sixt <j.sixt@viscovery.net> wrote:
>> Does that work?
>>
>
> No it doesn't.
>
> I had already C:\Program Files\Git\cmd in path, probably added by
> msysgit installation.
The point of the exercise is to not use the git.cmd wrapper. I.e. point
your path not into C:\Program Files\Git\cmd, but into the bin directories
so that you run git.exe, not git.cmd.
-- Hannes
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox