* Re: [PATCH] diff: resurrect XDF_NEED_MINIMAL with --minimal
From: Tay Ray Chuan @ 2011-10-03 13:04 UTC (permalink / raw)
To: Jonathan Nieder; +Cc: Junio C Hamano, git, René Scharfe
In-Reply-To: <20111003123843.GA15493@elie>
On Mon, Oct 3, 2011 at 8:38 PM, Jonathan Nieder <jrnieder@gmail.com> wrote:
Thanks for the Cc, Johnathan.
> Junio C Hamano wrote:
>
>> * This together with René's c5aa906 (Revert removal of multi-match
>> discard heuristic in 27af01, 2011-09-25) on top of v1.7.7 seems to give
>> identical diff output as v1.7.1 (e.g. "git diff-tree -p v2.6.39 v3.0"
>> in the kernel repository, with "--minimal").
>
> Very neat.
Interesting. Clearly there is more than just the multi-match discard
heuristic in (xdl_clean_mmatch() and xdl_cleanup_records()).
> diff --git i/diff.c w/diff.c
> index fcc00780..2282f86f 100644
> --- i/diff.c
> +++ w/diff.c
> @@ -3393,6 +3393,10 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
> DIFF_XDL_SET(options, IGNORE_WHITESPACE_AT_EOL);
> else if (!strcmp(arg, "--patience"))
> DIFF_XDL_SET(options, PATIENCE_DIFF);
> + else if (!strcmp(arg, "--minimal"))
> + DIFF_XDL_SET(options, NEED_MINIMAL);
> + else if (!strcmp(arg, "--no-minimal"))
> + DIFF_XDL_CLR(options, NEED_MINIMAL);
> else if (!strcmp(arg, "--histogram"))
> DIFF_XDL_SET(options, HISTOGRAM_DIFF);
>
>
That's an improvement, but it would be even better if it was placed
above the --<strategy> options, instead of being placed between them.
--
Cheers,
Ray Chuan
^ permalink raw reply
* Re: [PATCH] contrib: add a pair of credential helpers for Mac OS X's keychain
From: Jay Soffian @ 2011-10-03 13:13 UTC (permalink / raw)
To: Jeff King; +Cc: git, Junio C Hamano, John Szakmeister
In-Reply-To: <20111003105908.GF16078@sigill.intra.peff.net>
On Mon, Oct 3, 2011 at 6:59 AM, Jeff King <peff@peff.net> wrote:
> On Fri, Sep 30, 2011 at 06:42:22PM -0400, Jay Soffian wrote:
>
>> Usually it won't. In the default case, the keychain is unlocked and no
>> permission is needed to add an entry, nor to retrieve that entry by
>> the application which added it. The prompt will only occur if the
>> credential helper is not on the entry's ACL, or if the keychain is
>> locked.
>
> Yeah. I was thinking the ACL prompt would come up more often, but I
> guess most people would hit "allow always", since it would get annoying
> pretty quickly otherwise (I didn't, because I was testing).
In the normal case, the keychain entry would be added via the
credential helper, so they'd never even see the prompt since the
binary which adds an entry is automatically on that entry's ACL.
> Side note: do you know how to edit those ACLs? I couldn't find it in the
> keychain manager. It would be helpful for testing to be able to tweak it
> (as a workaround, I just modified the binary, which apparently the
> keychain code cares about).
Double-click on the entry in Keychain Access, then click the "Access
Control" tab.
j.
^ permalink raw reply
* Re: [PATCH] contrib: add a pair of credential helpers for Mac OS X's keychain
From: Jay Soffian @ 2011-10-03 13:16 UTC (permalink / raw)
To: John Szakmeister; +Cc: Jeff King, git, Junio C Hamano
In-Reply-To: <CAEBDL5XhLAccfMoSyBjDA4ZsCgc4FnxEVYyqJsnGfzDW3Otudw@mail.gmail.com>
On Sat, Oct 1, 2011 at 2:57 AM, John Szakmeister <john@szakmeister.net> wrote:
>>> I don't use GitHub for Mac... does that mean this is busted for me?
>>
>> No. It just means that the credential helper and GitHub for Mac store
>> their entry in a compatible fashion. (So that each can locate the
>> entry stored by the other.)
>
> Ah, interesting. But it does mean that it won't pick up the password
> I've cached via my browser, right?
Correct. I can add code to also make it look for the password entry as
stored by Safari/Chrome. It's actually stored as a slightly different
entry type ("Web form password" vs "Internet password"), so it's not
just the hostname difference.
j.
^ permalink raw reply
* Unable to remove a file
From: robert mena @ 2011-10-03 14:21 UTC (permalink / raw)
To: git
Hi,
I had a file called \ under a directory scripts. I've removed,
committed, pushed to the server BUT my windows clients when they try
to clone I stop because of this.
Don't ask me why and it is probably windows/the IDE fault but I have
to solve it.
I found the command filter but it is not working.
git filter-branch --index-filter 'git rm --cached scripts/\\' HEAD
Rewrite b75a1a3af45a4d82fcfe7a6148fc4d6e1c55ee91 (1/48)rm 'scripts/\'
Rewrite 8a32d6194e9c46dc0f1ce60a2245fcbcd7c12d00 (2/48)rm 'scripts/\'
Rewrite 892bba8bd7563186d7b1c493cf05d8823cfe2f7b (3/48)rm 'scripts/\'
Rewrite 0be74d8143f670b08806510dd09cf77029f57bcb (4/48)rm 'scripts/\'
Rewrite ec7e45a5d8100b7a1e49ca8d0cf5ec5d638f2dd7 (5/48)rm 'scripts/\'
Rewrite c9dde5bf86391a66f80dc86bcc3078c78866b5da (6/48)rm 'scripts/\'
Rewrite 499be785b2538a1d6b382e1a0d6e9bdc8a771a76 (7/48)rm 'scripts/\'
Rewrite 327ac340d4dee02bc2bfed07bd94df5f87b8036c (8/48)rm 'scripts/\'
Rewrite 5ae256edce2959585b2819c4d6d0d4704b02984a (9/48)rm 'scripts/\'
Rewrite 3811ef08c5a2be9f4f049c50caf501944483ec72 (10/48)rm 'scripts/\'
Rewrite 52b3de12d3cde4f6bb920d335fe8629d368d965b (11/48)rm 'scripts/\'
Rewrite ff115cd8f3213d8218d369361d5ee77010081c22 (12/48)rm 'scripts/\'
Rewrite d28c02b462e8ee70c6d516d7d2c6754b82bfc80e (13/48)rm 'scripts/\'
Rewrite 173aecfa81f64644747934f815befb8f83daf6ce (14/48)rm 'scripts/\'
Rewrite d4649a98584c25c1c8d52adbd49d822c961dc7cb (15/48)rm 'scripts/\'
Rewrite d026354566abc0d135cdd3838fa96055baa29a03 (16/48)rm 'scripts/\'
Rewrite 9f7869cf30bc0c04e072859bfbc1325758a5e893 (17/48)rm 'scripts/\'
Rewrite 6058b6d0b783cd290ce78e344f442d161989b72d (18/48)rm 'scripts/\'
Rewrite 7f7842d461a645223e39d5b6c451ec8b3e8f89a4 (19/48)rm 'scripts/\'
Rewrite 11f9ad3c22746e4fddb407790eb0db4db709902d (20/48)fatal:
pathspec 'scripts/\' did not match any files
index filter failed: git rm --cached scripts/\
How can I really delete this without having to start from scratch? I
won't hold my breath for windows or even the IDE's to detect this and
solve it.
^ permalink raw reply
* pack-object poor performance (with large number of objects?)
From: Piotr Krukowiecki @ 2011-10-03 14:43 UTC (permalink / raw)
To: Git Mailing List; +Cc: Ingo Molnar, Junio C Hamano
Hi,
I'm having poor git gc (pack-object) performance. Please read below
for details. What can I do to improve the performance/debug the reason
for the slowness? Should I leave the process running over night, or
should I stop it (for debugging)?
CCing people who posted some patches/benchmarks for pack-objects recently.
git gc was first run automatically by git svn clone. It found 1544673
objects and worked for 50 minutes until I've killed it.
Then I've run it by hand with --aggresive (because I've found on
Internet it helped in some cases). It found 1742200 objects this time.
At this moment it's been working for about 90 minutes.
The large number of unpacked objects is probably caused by me - I've
disabled auto gc when I was cloning from svn (I though it might speed
up things if it didn't repack several times during clone, only once
afterwards).
My git version is 1.7.7.rc3.4.g8d714
The file system is ext4.
First run process tree:
pkruk 27873 0.0 0.0 15704 816 pts/2 S+ 11:53 0:00
| | \_ git gc --auto
pkruk 27885 0.0 0.0 15704 776 pts/2 S+ 11:53 0:00
| | \_ git repack -d -l
pkruk 27886 0.0 0.0 4220 608 pts/2 S+ 11:53 0:00
| | \_ /bin/sh
/usr/local/stow/git-master/libexec/git-core/git-repack -d -l
pkruk 27897 3.6 9.3 1136072 381148 pts/2 D+ 11:53 5:51
| | \_ git
pack-objects --keep-true-parents --honor-pack-keep --non-empty --all
--reflog --unpacked --incremental --local --delta-base-offset
/home/pkruk/dv/devel1_git_repos/.git/objects/pack/.tmp-27886-pack
Second run process tree:
pkruk 6171 0.0 0.0 15704 1428 pts/2 S+ 14:34 0:00
| | \_ git gc --aggressive
pkruk 6174 0.0 0.0 15704 1356 pts/2 S+ 14:34 0:00
| | \_ git repack -d -l -f
--depth=250 --window=250 -A
pkruk 6175 0.0 0.0 4220 648 pts/2 S+ 14:34 0:00
| | \_ /bin/sh
/usr/local/stow/git-master/libexec/git-core/git-repack -d -l -f
--depth=250 --window=250 -A
pkruk 6189 4.9 10.5 1143640 427396 pts/2 D+ 14:34 4:50
| | \_ git pack-objects
--keep-true-parents --honor-pack-keep --non-empty --all --reflog
--unpack-unreachable --local --no-reuse-delta --depth=250 --window=250
--delta-base-offset
/home/pkruk/dv/devel1_git_repos/.git/objects/pack/.tmp-6175-pack
--
Piotr Krukowiecki
^ permalink raw reply
* Re: Branches & directories
From: Robin Rosenberg @ 2011-10-03 14:59 UTC (permalink / raw)
To: Hilco Wijbenga
Cc: Jeff King, Kyle Moffett, Michael Witten, Junio C Hamano,
Evan Shelhamer, Git Mailing List
In-Reply-To: <CAE1pOi2xmVHrVJcC85wvCv=anhn_kYizyUMpUVZF4EE33RoGmg@mail.gmail.com>
Hilco Wijbenga skrev 2011-10-03 09.15:
> On 2 October 2011 20:07, Jeff King<peff@peff.net> wrote:
> <snip/>
>> Or did you really mean your example literally, as in you run two
>> checkouts back to back, without running anything in between, and the
>> second checkout restores the state before the first one. In that case,
>> yes, it would be correct to keep the old timestamps. But this is an
>> optimization that can only apply in a few very specific cases. And
>> moreoever, how can git know when it is OK to apply that optimization? It
>> has no idea what commands you might have run since the last time we were
>> at "master".
> Yes, I meant it literally. And, no, Git could not possibly know so it
> would have to be optional behaviour. But it's probably a lot of work
> for (for most people) little gain.
> --
> 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
>
I wouldn't use stash for that. Just regular commit/amend and your
timestamps should be fine. Alternative submit a patch for either
the save or create subcommands of stash. That would not be very
hard (technically) and no one needs to mess with the timestamps;
they will just survive.
-- robin
^ permalink raw reply
* Re: Unable to remove a file
From: Andreas Schwab @ 2011-10-03 16:04 UTC (permalink / raw)
To: robert mena; +Cc: git
In-Reply-To: <CAAZ43xa2upWQ2LWJRVcOPew3kF0W7gSz9UgQ=g0gnMHKQB3Y4A@mail.gmail.com>
robert mena <robert.mena@gmail.com> writes:
> I found the command filter but it is not working.
>
> git filter-branch --index-filter 'git rm --cached scripts/\\' HEAD
$ git filter-branch --index-filter 'git rm -q --ignore-unmatch --cached scripts/\\' HEAD
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
* Re: pack-object poor performance (with large number of objects?)
From: Shawn Pearce @ 2011-10-03 16:05 UTC (permalink / raw)
To: Piotr Krukowiecki; +Cc: Git Mailing List, Ingo Molnar, Junio C Hamano
In-Reply-To: <CAA01CspZijOO_xbR=OcaRaesTeSy=6RM4DR01-07qimVzxvJZA@mail.gmail.com>
On Mon, Oct 3, 2011 at 07:43, Piotr Krukowiecki
<piotr.krukowiecki@gmail.com> wrote:
> I'm having poor git gc (pack-object) performance. Please read below
> for details. What can I do to improve the performance/debug the reason
> for the slowness? Should I leave the process running over night, or
> should I stop it (for debugging)?
> CCing people who posted some patches/benchmarks for pack-objects recently.
>
> git gc was first run automatically by git svn clone. It found 1544673
> objects and worked for 50 minutes until I've killed it.
>
> Then I've run it by hand with --aggresive (because I've found on
> Internet it helped in some cases). It found 1742200 objects this time.
> At this moment it's been working for about 90 minutes.
Packing time depends on a number of factors. One of them is the number
of unpacked objects to process. With 1.7 million objects, yes, its
going to take some time. Another factor is how much RAM you have on
your system. Packing requires a lot of memory, especially with the
--aggressive flag, as the packer tries up to 250 different
combinations of two objects searching for a good delta compression
format, and all 250 of those are typically in-memory at once. If you
have insufficient physical RAM, the system will swap, unless you
decrease the window size.
> The large number of unpacked objects is probably caused by me - I've
> disabled auto gc when I was cloning from svn (I though it might speed
> up things if it didn't repack several times during clone, only once
> afterwards).
Yes, this the reason `git svn` runs GC during its import. If you defer
all of the repacking work until the end, with everything loose, it can
take a very, very long time to repack. If you repack as you go, the
incremental repacks are less expensive than a full repack, and the
entire process will go faster overall.
--
Shawn.
^ permalink raw reply
* Re: [RFC/PATCH] git checkout $tree path
From: Junio C Hamano @ 2011-10-03 16:08 UTC (permalink / raw)
To: Jeff King; +Cc: git
In-Reply-To: <20111003102647.GD16078@sigill.intra.peff.net>
Jeff King <peff@peff.net> writes:
> But we can't distinguish those two cases without actually having a merge
> base. And this isn't a merge; it's not about picking changes from
> master, it's about saying "make dir look like it does in master". So
> in that sense, the most straightforward thing is your second
> alternative: afterwards, we should have only the files in "dir" that
> master has.
We can think of it both ways, but the "make it look like the other one"
unfortunately is too big a departure from the traditional semantics. At
least I wanted "checkout master -- $path" to mean "I want to copy $path
out of master and _overlay_ that on top of what I have now", similar to
the way how "tar xf master.tar $path" and "cp -r ../master/$path $path"
would be used, so that the command can help the user advance what is in
progress and already underway in $path in the current working tree.
Replacing could be easily done with "git rm -r [--cached] $path" followed
by "git checkout $tree $path" under the original semantics, but overlaying
is not very easily done if "git checkout $tree $path" had your "make $path
look like it does in $tree" semantics.
The change brought in by the RFC/PATCH does change the behaviour, and I am
fairly comfortable now to say that it is a bugfix ("copy and overlay" a la
"tar xf" never clobbers/removes files not in the source, but the current
code does).
^ permalink raw reply
* strange behaviour, default branch on clone not as expected
From: Chris Friesen @ 2011-10-03 16:50 UTC (permalink / raw)
To: git
Hi,
I have a bare repository on a server with (among others) branches
"atca6900-ecgl" and "ncgl". The "HEAD" file in the bare repository
contains "ref: refs/heads/ncgl" and "git branch" in the bare repository
shows an asterisk beside "ncgl".
However, if I clone the bare repository I get "atca-6900-ecgl" as the
default branch. ".git/HEAD" contains "ref: refs/heads/atca6900-ecgl".
Something that might be relevent--currently both of these branches
actually point to the same commit (Don't ask, it's a vendor thing.) thus
"refs/heads/atca6900-ecgl" and "refs/heads/ncgl" have the same contents.
I find it suspicious that atca6900-ecgl is alphabetically before ncgl
and that they point to the same commit ID...but I don't know how it
works internally so this may be just coincidence.
Any ideas what's going on? I'm using git 1.7.3.2 if it makes any
difference.
Chris
--
Chris Friesen
Software Developer
GENBAND
chris.friesen@genband.com
www.genband.com
^ permalink raw reply
* Re: [RFC/PATCH]: reverse bisect v 2.0
From: Junio C Hamano @ 2011-10-03 17:00 UTC (permalink / raw)
To: Jeff King
Cc: Michal Vyskocil, git, Sverre Rabbelier, Johannes Sixt,
Christian Couder
In-Reply-To: <20111003104112.GE16078@sigill.intra.peff.net>
Jeff King <peff@peff.net> writes:
> On Fri, Sep 30, 2011 at 11:13:25AM -0700, Junio C Hamano wrote:
>
>> I wonder if something along the following line would make the usage more
>> pleasant and self-explanatory:
>>
>> $ git bisect start --used-to='git frotz says xyzzy' v0.99 master
>> Bisecting: 171 revisions left to test after this (roughly 8 steps)
>> $ ... build and then test ...
>> $ git bisect tested
>> You are trying to check: git frotz says xyzzy
>> Does the result satisify what you are trying to find [y/n]? yes
>
> I like this idea a lot. My "yes/no" thing was a "if I were designing
> bisect from scratch today..." suggestion, but having something like
> --used-to makes it a natural addition to the regular good/bad interface.
> And I really like the prompt to help people remember what it is they're
> declaring each time.
I forgot to clarify that "tested" was only to help users who wanted
reminder; if the user is confident with the usual "yes/no", the
interactivity is not required.
> However, --used-to feels a bit backwards to me. I think of it as
> "--has-property" or something similar.
I do not think --used-to='frotz says xyzzy' is a good phrasing at all; it
is grammatically incorrect. But --has-property has one large downside. At
least --used-to makes it clear that the user is supposed to decribe the
property of the tree in the past.
Let's step back a bit to understand why I think this is not optimal.
The low-level "bisect" machinery is about bisecting a history whose
ancient commits have a property (e.g. "used to work" or "used to be
broken") and more recent ones does not have the property to find one
commit where the property is lost. Conceptually, this "property" does not
have any value judgement associated with it, but historically, we called
that property "good" (and lack of it "bad"), which caused confusion at the
surface level when looking for a recent fix. The user has to say "ah, this
is still broken and does not contain the fix---good" with a twisted mind.
To dissociate the value judgement from the "property", it is a good idea
to allow users to operate the bisect machinery without using "good/bad",
and "yes/no" is a good pair of words to use. However, the user still needs
to be aware of the fact that the "property" must exist in older history
and must be lacking in newer history.
"--has-property" strips the value judgement but does not surface this
crucial point to the UI. When the user wants to find a recent fix, the
property can be spelled in various ways: "it is broken", "it no longer is
broken", "it is fixed", "it works", etc.. We need to map the 'yes' answer
to 'bad' if --has-property=works is given and the user is looking for a
fix, not a regression. But --has-property does not explicitly tell the
user that the property must exist in the past and absent in the present.
My --used-to was an attempt to surface this "we are looking for a commit
that changed the condition that used to hold, but no longer holds for
recent commits" to the UI level and force "yes == observation consistent
with the older tree" and "no == new tree" interpretation, without a need
to map yes/no to good/bad or bad/good depending on what is hunted.
The alternative approach of "bisect start --reverse" was an attempt to
allow swapping this mapping. When reverse is in effect, "good" maps to
"observation consistent with the newer tree". I do not _mind_ mapping if
it turns out to be absolutely necessary, but I wanted to see if we can do
this without one.
> something appeared (be it a bug, a feature, or whatever). But I guess it
> depends on what you are bisecting. In my case, "yes" would be the
> current "bad", and "no" would be the current "good".
I think we are aiming for the same thing, but I think you are assuming
that a naive user would always describe the condition that used to hold
with --has-property without being told; I do not think that assumption
holds.
^ permalink raw reply
* Re: pack-object poor performance (with large number of objects?)
From: Piotr Krukowiecki @ 2011-10-03 17:17 UTC (permalink / raw)
To: Shawn Pearce; +Cc: Git Mailing List, Ingo Molnar, Junio C Hamano
In-Reply-To: <CAJo=hJtw+sYrP09zrDbZJNGHDYOeguQLkOe88FBYQDZrnaqsAw@mail.gmail.com>
On Mon, Oct 3, 2011 at 6:05 PM, Shawn Pearce <spearce@spearce.org> wrote:
> On Mon, Oct 3, 2011 at 07:43, Piotr Krukowiecki
> <piotr.krukowiecki@gmail.com> wrote:
>> I'm having poor git gc (pack-object) performance. Please read below
>> for details. What can I do to improve the performance/debug the reason
>> for the slowness? Should I leave the process running over night, or
>> should I stop it (for debugging)?
>> CCing people who posted some patches/benchmarks for pack-objects recently.
>>
>> git gc was first run automatically by git svn clone. It found 1544673
>> objects and worked for 50 minutes until I've killed it.
>>
>> Then I've run it by hand with --aggresive (because I've found on
>> Internet it helped in some cases). It found 1742200 objects this time.
>> At this moment it's been working for about 90 minutes.
>
> Packing time depends on a number of factors. One of them is the number
> of unpacked objects to process. With 1.7 million objects, yes, its
> going to take some time.
Any statistics how long it should take?
> Another factor is how much RAM you have on
> your system. Packing requires a lot of memory, especially with the
> --aggressive flag, as the packer tries up to 250 different
> combinations of two objects searching for a good delta compression
> format, and all 250 of those are typically in-memory at once. If you
> have insufficient physical RAM, the system will swap, unless you
> decrease the window size.
I have 4GB of RAM and not all was used so it certainly shouldn't be
swapping. The process was in 'D' state so I suppose the hard disk
might be the limiting factor.
I think I also disabled threading (I'll check tomorrow) - I suppose it
has impact on packing time too.
I'll re-run packing tomorrow with threading and check the memory
usage, is there anything else I can do?
>
>> The large number of unpacked objects is probably caused by me - I've
>> disabled auto gc when I was cloning from svn (I though it might speed
>> up things if it didn't repack several times during clone, only once
>> afterwards).
>
> Yes, this the reason `git svn` runs GC during its import. If you defer
> all of the repacking work until the end, with everything loose, it can
> take a very, very long time to repack. If you repack as you go, the
> incremental repacks are less expensive than a full repack, and the
> entire process will go faster overall.
I've learned the lesson :)
--
Piotr Krukowiecki
^ permalink raw reply
* Re: Do we have a convenient way to refer to a specific commit in an already filtered rev-list?
From: Tzu-Jung Lee @ 2011-10-03 17:19 UTC (permalink / raw)
To: Jeff King; +Cc: git
In-Reply-To: <20110927213517.GB5176@sigill.intra.peff.net>
On Wed, Sep 28, 2011 at 5:35 AM, Jeff King <peff@peff.net> wrote:
> On Sun, Sep 25, 2011 at 12:46:20AM +0800, Tzu-Jung Lee wrote:
>
>> Do we have a convenient/symbolic way to refer to a specific commit of
>> an already filtered rev-list? For example, I'm interested in the
>> commits with some constraints:
>>
>> git log somepath --author=someone
>>
>> Without gui/tui tools, I have to frequently CUT & PASTE the commit-ID
>> for further manipulation (show, cherry-pick, ...), and possibly repeat
>> the parsing couple of times if I didn't save the output. I wonder if
>> we have a convenient way to refer to the discrete commits? like
>> HEAD~4, HEAD@{3} or something magic.
>
> Use the shell:
>
> git rev-list --author=someone HEAD >saved-query
> git log --no-walk --stdin <saved-query
> git cherry-pick `cat saved-query`
>
> or even:
>
> q=`git rev-list --author=someone HEAD`
> git log --no-walk $q
> git cherry-pick $q
>
> -Peff
>
Cool, this does record and replay.
How about adding a command or teaching some existing one an option
like --saved=<ref_name>, which put the saved-list to
refs/saved/<ref_name> ?
And also teach the rev-list to parse or interpret the 'saved' refs differently.
So we can have the following use case:
git log branch_foo --author=some_one -S some_string --saved=cached_ref
git log cached_ref
git cherry-pick cached_ref~4
git format-patch cached_ref~6..cached_ref~2
I often have such use cases. not sure others would be benefited from
such feature.
Just asking for comment. :)
Regards,
Roy
^ permalink raw reply
* Re: Branches & directories
From: Hilco Wijbenga @ 2011-10-03 17:20 UTC (permalink / raw)
To: Robin Rosenberg
Cc: Jeff King, Kyle Moffett, Michael Witten, Junio C Hamano,
Evan Shelhamer, Git Mailing List
In-Reply-To: <4E89CDCA.9030802@gmail.com>
On 3 October 2011 07:59, Robin Rosenberg <robin.rosenberg@gmail.com> wrote:
> Hilco Wijbenga skrev 2011-10-03 09.15:
>>
>> On 2 October 2011 20:07, Jeff King<peff@peff.net> wrote:
>> <snip/>
>>>
>>> Or did you really mean your example literally, as in you run two
>>> checkouts back to back, without running anything in between, and the
>>> second checkout restores the state before the first one. In that case,
>>> yes, it would be correct to keep the old timestamps. But this is an
>>> optimization that can only apply in a few very specific cases. And
>>> moreoever, how can git know when it is OK to apply that optimization? It
>>> has no idea what commands you might have run since the last time we were
>>> at "master".
>>
>> Yes, I meant it literally. And, no, Git could not possibly know so it
>> would have to be optional behaviour. But it's probably a lot of work
>> for (for most people) little gain.
>> --
>> 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
>>
> I wouldn't use stash for that. Just regular commit/amend and your
> timestamps should be fine. Alternative submit a patch for either
> the save or create subcommands of stash. That would not be very
> hard (technically) and no one needs to mess with the timestamps;
> they will just survive.
By "that" you mean jump to another branch? I don't see how doing an
explicit commit changes anything. Stashing is essentially committing
(i.e. a "dummy" commit is created to store the stash, IIUC), isn't it?
As I mentioned before, I'm quite happy with git-new-workdir. It allows
me to work exactly the way I want. I may have some philosophical
reservations about Git's timestamp handling but practically speaking
I'm a happy little camper. :-)
^ permalink raw reply
* Re: Branches & directories
From: Hilco Wijbenga @ 2011-10-03 17:31 UTC (permalink / raw)
To: Matthieu Moy
Cc: Jeff King, Robin Rosenberg, Kyle Moffett, Michael Witten,
Junio C Hamano, Evan Shelhamer, Git Mailing List
In-Reply-To: <vpqaa9ijzt4.fsf@bauges.imag.fr>
On 3 October 2011 00:32, Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> wrote:
> Hilco Wijbenga <hilco.wijbenga@gmail.com> writes:
>
>> Yes, I meant it literally. And, no, Git could not possibly know so it
>> would have to be optional behaviour. But it's probably a lot of work
>> for (for most people) little gain.
>
> Not only little gain, but also important risk: users of this feature
> would be likely to spend hours debugging something just because some
> files weren't recompiled at the right time.
Possibly. When I do a git pull or similar I do a full build
regardless. I don't know of any build tool that triggers a build
because of a deleted source file (that's an actual problem I ran into
only a couple of weeks ago). Of course, in that scenario the build was
succeeding where it should have been failing. :-)
> If you want to optimize the number of files compiled by "make", then
> ccache is your friend. This one is safe.
This is all C, right? I'm in Java land so I would assume ccache is of
no use to me. And we certainly don't use make.
^ permalink raw reply
* Re: strange behaviour, default branch on clone not as expected
From: Junio C Hamano @ 2011-10-03 17:35 UTC (permalink / raw)
To: Chris Friesen; +Cc: git
In-Reply-To: <4E89E7E1.4000907@genband.com>
Chris Friesen <chris.friesen@genband.com> writes:
> I have a bare repository on a server with (among others) branches
> "atca6900-ecgl" and "ncgl". The "HEAD" file in the bare repository
> contains "ref: refs/heads/ncgl" and "git branch" in the bare
> repository shows an asterisk beside "ncgl".
>
> However, if I clone the bare repository I get "atca-6900-ecgl" as the
> default branch. ".git/HEAD" contains "ref: refs/heads/atca6900-ecgl".
If ncgl is at the same commit as the acta one, this is expected. The
protocol does not carry enough information to tell which branch HEAD
points at.
^ permalink raw reply
* Re: [PATCH v2] gitk: Show patch for initial commit
From: Junio C Hamano @ 2011-10-03 17:44 UTC (permalink / raw)
To: Marcus Karlsson; +Cc: Zbigniew J??drzejewski-Szmek, git, Paul Mackerras
In-Reply-To: <20111003063359.GA11391@kennedy.acc.umu.se>
Marcus Karlsson <mk@acc.umu.se> writes:
>> Also the gitk should be mentioned in the man-page for git-config log.showroot.
>> The current description of this option seems suboptimal because it explains
>> how it used to be, which is not really relevant:
>> log.showroot
>> If true, the initial commit will be shown as a big creation event. This is
>> equivalent to a diff against an empty tree. Tools like git-log(1) or git-
>> whatchanged(1), which normally hide the root commit will now show it. True by
>> default.
>> This could be changed to:
>> If true (the default), the root commit will be shown as a big creation
>> event --- a diff against an empty tree. This diff can be very large for
>> a project which was imported into git after some development history.
>> If log.showroot is false tools like git-log(1), git-whatchanged(1), or
>> gitk(1) will not display the added files.
>
> I agree, but that feels like something that could be made into a
> separate patch. Or should I include that too?
Please make it a separate patch. A patch to Documentation/config.txt
should go to git.git project, but gitk patch (whose "diff --git" line
should read "diff --git a/gitk b/gitk") should go first to gitk.git
project and then merged to my tree.
^ permalink raw reply
* Re: Git is not scalable with too many refs/*
From: Martin Fick @ 2011-10-03 18:12 UTC (permalink / raw)
To: git
Cc: Christian Couder, Thomas Rast, René Scharfe, Julian Phillips,
Michael Haggerty
In-Reply-To: <201109301606.31748.mfick@codeaurora.org>
On Friday, September 30, 2011 04:06:31 pm Martin Fick wrote:
>
> OK, I narrowed it down I believe. If I comment out the
> invalidate_cached_refs() line in write_ref_sha1(), it
> speeds through this section.
>
> I guess this makes sense, we invalidate the cache and
> have to rebuild it after every new ref is added?
> Perhaps a simple fix would be to move the invalidation
> right after all the refs are updated? Maybe
> write_ref_sha1 could take in a flag to tell it to not
> invalidate the cache so that during iterative updates it
> could be disabled and then run manually after the
> update?
Would this solution be acceptable if I submitted a patch to
do it? My test shows that this will make a full fetch of
~80K changes go from 4:50min to 1:50min,
-Martin
--
Employee of Qualcomm Innovation Center, Inc. which is a
member of Code Aurora Forum
^ permalink raw reply
* Re: [PATCH/RFC] remote: support --all for the prune-subcommand
From: Jacob Helwig @ 2011-10-03 18:13 UTC (permalink / raw)
To: Erik Faye-Lund; +Cc: git
In-Reply-To: <1317644168-5808-1-git-send-email-kusmabite@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 676 bytes --]
On Mon, 03 Oct 2011 14:16:08 +0200, Erik Faye-Lund wrote:
>
> While we're at it, wrap a long line to fit on a 80 char terminal.
>
> Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
> ---
>
> I recently needed to prune remote branches in a repo with a lot
> of remotes, and to my surprise "git remote prune" didn't support
> the --all option. So I added it. Perhaps this is useful for other
> people as well?
>
Can't really comment on the implementation (especially since I didn't
actually look at it), but having "git remote prune --all" work would be
_tremendously_ helpful to me. Thanks for doing this!
--
Jacob Helwig
http://about.me/jhelwig
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 665 bytes --]
^ permalink raw reply
* Re: [PATCH] transport: do not allow to push over git:// protocol
From: Nguyen Thai Ngoc Duy @ 2011-10-03 18:13 UTC (permalink / raw)
To: Ilari Liusvaara; +Cc: Jeff King, git
In-Reply-To: <20111003110159.GA13064@LK-Perkele-VI.localdomain>
On Mon, Oct 03, 2011 at 02:01:59PM +0300, Ilari Liusvaara wrote:
> On Mon, Oct 03, 2011 at 03:42:51AM -0400, Jeff King wrote:
> > On Sat, Oct 01, 2011 at 11:26:55AM +1000, Nguyen Thai Ngoc Duy wrote:
> >
> > The real problem here seems to be that instead of communicating "no, we
> > don't support that", git-daemon just hangs up. It would be a much nicer
> > fix if we could change that. I'm not sure it's possible, though. There's
> > not much room in the beginning of the room to make that communication in
> > a way that's backwards compatible.
>
> Oh, sure it is possible (except for remote snapshot):
>
> $ /usr/bin/git fetch git://localhost/foobar
> fatal: remote error: R access for foobar DENIED to anonymous
> $ /usr/bin/git push git://localhost/foobar
> fatal: remote error: W access for foobar DENIED to anonymous
> $ /usr/bin/git archive --remote=git://localhost/foobar HEAD
> fatal: git archive: protocol error
> $ /usr/bin/git --version
> git version 1.7.6.3
>
> Supported for fetch and push since 1.6.1-rc1 (And 1.6.1 was over
> 2.5 years ago). Oh, and even before that, but with slightly more
> ugly error message.
>
> Oh, and adding interpretation of ERR packets to git archive is easy
> (and I even happen to have git:// server that can send those to
> test against):
>
> $ git archive --remote=git://localhost/foobar HEAD
> fatal: remote error: R access for foobar DENIED to anonymous
>
> (I also tested that remote snapshotting of repository that should be
> readable succeeds, it does).
>
> --- >8 ----
> From ce3a402e4fa72cf603f92801d6f021ff89d3ac35 Mon Sep 17 00:00:00 2001
> From: Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
> Date: Mon, 3 Oct 2011 13:55:37 +0300
> Subject: [PATCH] Support ERR in remote archive like in fetch/push
>
> Make ERR as first packet of remote snapshot reply work like it does in
> fetch/push. Lets servers decline remote snapshot with message the same
> way as declining fetch/push with a message.
>
> Signed-off-by: Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
Yeah, maybe with this patch also?
-- 8< --
Subject: [PATCH] pack-protocol: document "ERR" line
Since a807328 (connect.c: add a way for git-daemon to pass an error
back to client), git client recognizes "ERR" line and prints a
friendly message to user if an error happens at server side.
Document this.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
Documentation/technical/pack-protocol.txt | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/Documentation/technical/pack-protocol.txt b/Documentation/technical/pack-protocol.txt
index a7004c6..546980c 100644
--- a/Documentation/technical/pack-protocol.txt
+++ b/Documentation/technical/pack-protocol.txt
@@ -60,6 +60,13 @@ process on the server side over the Git protocol is this:
"0039git-upload-pack /schacon/gitbook.git\0host=example.com\0" |
nc -v example.com 9418
+If the server refuses the request for some reasons, it could abort
+gracefully with an error message.
+
+----
+ error-line = PKT-LINE("ERR" SP explanation-text)
+----
+
SSH Transport
-------------
--
-- 8< --
^ permalink raw reply related
* Re: [PATCH] po/pl.po: Eliminate fuzzy translations
From: Ævar Arnfjörð Bjarmason @ 2011-10-03 18:30 UTC (permalink / raw)
To: Jakub Narebski; +Cc: Git Mailing List, Marcin Cieślak
In-Reply-To: <m3ipre4dtf.fsf@localhost.localdomain>
2011/7/7 Jakub Narebski <jnareb@gmail.com>:
> Remove all fuzzy translations by either correcting them where trivial,
> or removing them altogether.
I was about to try to submit this (better late than never) but I can't
get git-am to accept this mail which has quoted-printable format.
Can you perchance send this as a git:// URL or as a *.patch file attachment?
^ permalink raw reply
* Re: [PATCH] po/pl.po: Eliminate fuzzy translations
From: Ævar Arnfjörð Bjarmason @ 2011-10-03 18:39 UTC (permalink / raw)
To: Jakub Narebski; +Cc: Git Mailing List
In-Reply-To: <CACBZZX7wj=j9Mx-m0HrRoRHP1HOSVpn-7o0YVnY6LsfWzuw8aw@mail.gmail.com>
On Mon, Oct 3, 2011 at 20:30, Ævar Arnfjörð Bjarmason <avarab@gmail.com> wrote:
> 2011/7/7 Jakub Narebski <jnareb@gmail.com>:
>> Remove all fuzzy translations by either correcting them where trivial,
>> or removing them altogether.
>
> I was about to try to submit this (better late than never) but I can't
> get git-am to accept this mail which has quoted-printable format.
>
> Can you perchance send this as a git:// URL or as a *.patch file attachment?
Sorry about the noise. Didn't mean to send this to the list.
^ permalink raw reply
* Re: [PATCH v3 4/4] upload-archive: use start_command instead of fork
From: Junio C Hamano @ 2011-10-03 18:39 UTC (permalink / raw)
To: Erik Faye-Lund; +Cc: git, peff, j6t, rene.scharfe
In-Reply-To: <1317329963-6656-5-git-send-email-kusmabite@gmail.com>
Erik Faye-Lund <kusmabite@gmail.com> writes:
> Add an undocumented flag to git-archive that tells it that the
> action originated from a remote, so features can be disabled.
> diff --git a/builtin/upload-archive.c b/builtin/upload-archive.c
> index 2d0b383..c57e8bd 100644
> --- a/builtin/upload-archive.c
> +++ b/builtin/upload-archive.c
> @@ -6,6 +6,7 @@
> #include "archive.h"
> #include "pkt-line.h"
> #include "sideband.h"
> +#include "run-command.h"
>
> static const char upload_archive_usage[] =
> "git upload-archive <repo>";
> @@ -18,28 +19,17 @@ static const char lostchild[] =
>
> #define MAX_ARGS (64)
>
> -static int run_upload_archive(int argc, const char **argv, const char *prefix)
> +static void prepare_argv(const char **sent_argv, const char **argv)
> {
> - const char *sent_argv[MAX_ARGS];
> const char *arg_cmd = "argument ";
> char *p, buf[4096];
> int sent_argc;
> int len;
>
> + sent_argc = 2;
> + sent_argv[0] = "archive";
> + sent_argv[1] = "--remote-request";
> for (p = buf;;) {
> /* This will die if not enough free space in buf */
> len = packet_read_line(0, p, (buf + sizeof buf) - p);
Hmm, forgetting the "Windows" for a while, does this client work against
the remote repositories that are running deployed versions of Git?
^ permalink raw reply
* Re: [PATCH v3 4/4] upload-archive: use start_command instead of fork
From: Erik Faye-Lund @ 2011-10-03 18:48 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, peff, j6t, rene.scharfe
In-Reply-To: <7vy5x1gbr6.fsf@alter.siamese.dyndns.org>
On Mon, Oct 3, 2011 at 8:39 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Erik Faye-Lund <kusmabite@gmail.com> writes:
>
>> Add an undocumented flag to git-archive that tells it that the
>> action originated from a remote, so features can be disabled.
>
>> diff --git a/builtin/upload-archive.c b/builtin/upload-archive.c
>> index 2d0b383..c57e8bd 100644
>> --- a/builtin/upload-archive.c
>> +++ b/builtin/upload-archive.c
>> @@ -6,6 +6,7 @@
>> #include "archive.h"
>> #include "pkt-line.h"
>> #include "sideband.h"
>> +#include "run-command.h"
>>
>> static const char upload_archive_usage[] =
>> "git upload-archive <repo>";
>> @@ -18,28 +19,17 @@ static const char lostchild[] =
>>
>> #define MAX_ARGS (64)
>>
>> -static int run_upload_archive(int argc, const char **argv, const char *prefix)
>> +static void prepare_argv(const char **sent_argv, const char **argv)
>> {
>> - const char *sent_argv[MAX_ARGS];
>> const char *arg_cmd = "argument ";
>> char *p, buf[4096];
>> int sent_argc;
>> int len;
>>
>> + sent_argc = 2;
>> + sent_argv[0] = "archive";
>> + sent_argv[1] = "--remote-request";
>> for (p = buf;;) {
>> /* This will die if not enough free space in buf */
>> len = packet_read_line(0, p, (buf + sizeof buf) - p);
>
> Hmm, forgetting the "Windows" for a while, does this client work against
> the remote repositories that are running deployed versions of Git?
>
It should, the change is completely server-side. The first two entries
in sent_argv aren't sent over the network protocol, but the ones that
follow them are.
Or did I misunderstand your concern?
^ permalink raw reply
* [PATCH 1/9] po/is.po: add Icelandic translation
From: Ævar Arnfjörð Bjarmason @ 2011-10-03 18:58 UTC (permalink / raw)
To: git
Cc: Junio C Hamano, Ramkumar Ramachandra, Peter Krefting,
Marcin Cieślak, Sam Reed, Jan Engelhardt, Jan Krüger,
Ævar Arnfjörð Bjarmason
In-Reply-To: <1317668297-2702-1-git-send-email-avarab@gmail.com>
Translate some non-TEST into Icelandic. This is far from a complete
translation, I've only translated init-db.c.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
po/is.po | 3412 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 3412 insertions(+), 0 deletions(-)
create mode 100644 po/is.po
diff --git a/po/is.po b/po/is.po
new file mode 100644
index 0000000..db8cb65
--- /dev/null
+++ b/po/is.po
@@ -0,0 +1,3412 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Git\n"
+"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
+"POT-Creation-Date: 2011-07-06 19:20+0000\n"
+"PO-Revision-Date: 2011-07-06 19:07 +0000\n"
+"Last-Translator: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n"
+"Language-Team: Git Mailing List <git@vger.kernel.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: diff.c:104
+#, c-format
+msgid " Failed to parse dirstat cut-off percentage '%.*s'\n"
+msgstr ""
+
+#: diff.c:109
+#, fuzzy, c-format
+msgid " Unknown dirstat parameter '%.*s'\n"
+msgstr "gat ekki stat-að sniðið '%s'"
+
+#: diff.c:205
+#, c-format
+msgid ""
+"Found errors in 'diff.dirstat' config variable:\n"
+"%s"
+msgstr ""
+
+#: diff.c:3295
+#, c-format
+msgid ""
+"Failed to parse --dirstat/-X option parameter:\n"
+"%s"
+msgstr ""
+
+#: wt-status.c:134
+msgid "Unmerged paths:"
+msgstr ""
+
+#: wt-status.c:140 wt-status.c:157
+#, c-format
+msgid " (use \"git reset %s <file>...\" to unstage)"
+msgstr ""
+
+#: wt-status.c:142 wt-status.c:159
+msgid " (use \"git rm --cached <file>...\" to unstage)"
+msgstr ""
+
+#: wt-status.c:143
+msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
+msgstr ""
+
+#: wt-status.c:151
+msgid "Changes to be committed:"
+msgstr ""
+
+#: wt-status.c:169
+msgid "Changes not staged for commit:"
+msgstr ""
+
+#: wt-status.c:173
+msgid " (use \"git add <file>...\" to update what will be committed)"
+msgstr ""
+
+#: wt-status.c:175
+msgid " (use \"git add/rm <file>...\" to update what will be committed)"
+msgstr ""
+
+#: wt-status.c:176
+msgid ""
+" (use \"git checkout -- <file>...\" to discard changes in working directory)"
+msgstr ""
+
+#: wt-status.c:178
+msgid " (commit or discard the untracked or modified content in submodules)"
+msgstr ""
+
+#: wt-status.c:187
+#, c-format
+msgid "%s files:"
+msgstr ""
+
+#: wt-status.c:190
+#, c-format
+msgid " (use \"git %s <file>...\" to include in what will be committed)"
+msgstr ""
+
+#: wt-status.c:207
+msgid "bug"
+msgstr ""
+
+#: wt-status.c:212
+msgid "both deleted:"
+msgstr ""
+
+#: wt-status.c:213
+msgid "added by us:"
+msgstr ""
+
+#: wt-status.c:214
+msgid "deleted by them:"
+msgstr ""
+
+#: wt-status.c:215
+msgid "added by them:"
+msgstr ""
+
+#: wt-status.c:216
+msgid "deleted by us:"
+msgstr ""
+
+#: wt-status.c:217
+msgid "both added:"
+msgstr ""
+
+#: wt-status.c:218
+msgid "both modified:"
+msgstr ""
+
+#: wt-status.c:248
+msgid "new commits, "
+msgstr ""
+
+#: wt-status.c:250
+msgid "modified content, "
+msgstr ""
+
+#: wt-status.c:252
+msgid "untracked content, "
+msgstr ""
+
+#: wt-status.c:266
+#, c-format
+msgid "new file: %s"
+msgstr ""
+
+#: wt-status.c:269
+#, c-format
+msgid "copied: %s -> %s"
+msgstr ""
+
+#: wt-status.c:272
+#, c-format
+msgid "deleted: %s"
+msgstr ""
+
+#: wt-status.c:275
+#, c-format
+msgid "modified: %s"
+msgstr ""
+
+#: wt-status.c:278
+#, c-format
+msgid "renamed: %s -> %s"
+msgstr ""
+
+#: wt-status.c:281
+#, c-format
+msgid "typechange: %s"
+msgstr ""
+
+#: wt-status.c:284
+#, c-format
+msgid "unknown: %s"
+msgstr ""
+
+#: wt-status.c:287
+#, c-format
+msgid "unmerged: %s"
+msgstr ""
+
+#: wt-status.c:290
+#, c-format
+msgid "bug: unhandled diff status %c"
+msgstr ""
+
+#: wt-status.c:713
+msgid "On branch "
+msgstr ""
+
+#: wt-status.c:720
+msgid "Not currently on any branch."
+msgstr ""
+
+#: wt-status.c:731
+#, fuzzy
+msgid "Initial commit"
+msgstr "Bjó til tóma"
+
+#: wt-status.c:745
+msgid "Untracked"
+msgstr ""
+
+#: wt-status.c:747
+msgid "Ignored"
+msgstr ""
+
+#: wt-status.c:749
+#, c-format
+msgid "Untracked files not listed%s"
+msgstr ""
+
+#: wt-status.c:751
+msgid " (use -u option to show untracked files)"
+msgstr ""
+
+#: wt-status.c:757
+msgid "No changes"
+msgstr ""
+
+#: wt-status.c:761
+#, c-format
+msgid "no changes added to commit%s\n"
+msgstr ""
+
+#: wt-status.c:763
+msgid " (use \"git add\" and/or \"git commit -a\")"
+msgstr ""
+
+#: wt-status.c:765
+#, c-format
+msgid "nothing added to commit but untracked files present%s\n"
+msgstr ""
+
+#: wt-status.c:767
+msgid " (use \"git add\" to track)"
+msgstr ""
+
+#: wt-status.c:769 wt-status.c:772 wt-status.c:775
+#, c-format
+msgid "nothing to commit%s\n"
+msgstr ""
+
+#: wt-status.c:770
+msgid " (create/copy files and use \"git add\" to track)"
+msgstr ""
+
+#: wt-status.c:773
+msgid " (use -u to show untracked files)"
+msgstr ""
+
+#: wt-status.c:776
+msgid " (working directory clean)"
+msgstr ""
+
+#: wt-status.c:884
+msgid "HEAD (no branch)"
+msgstr ""
+
+#: wt-status.c:890
+msgid "Initial commit on "
+msgstr ""
+
+#: wt-status.c:905
+msgid "behind "
+msgstr ""
+
+#: wt-status.c:908 wt-status.c:911
+msgid "ahead "
+msgstr ""
+
+#: wt-status.c:913
+msgid ", behind "
+msgstr ""
+
+#: builtin/add.c:61
+#, c-format
+msgid "unexpected diff status %c"
+msgstr ""
+
+#: builtin/add.c:66 builtin/commit.c:291
+msgid "updating files failed"
+msgstr ""
+
+#: builtin/add.c:76
+#, c-format
+msgid "remove '%s'\n"
+msgstr ""
+
+#: builtin/add.c:175
+#, c-format
+msgid "Path '%s' is in submodule '%.*s'"
+msgstr ""
+
+#: builtin/add.c:191
+msgid "Unstaged changes after refreshing the index:"
+msgstr ""
+
+#: builtin/add.c:194 builtin/add.c:454 builtin/rm.c:186
+#, c-format
+msgid "pathspec '%s' did not match any files"
+msgstr ""
+
+#: builtin/add.c:208
+#, c-format
+msgid "'%s' is beyond a symbolic link"
+msgstr ""
+
+#: builtin/add.c:275
+msgid "Could not read the index"
+msgstr ""
+
+#: builtin/add.c:284
+#, c-format
+msgid "Could not open '%s' for writing."
+msgstr ""
+
+#: builtin/add.c:288
+#, fuzzy
+msgid "Could not write patch"
+msgstr "Gat ekki gert %s skrifanlega af hóp"
+
+#: builtin/add.c:293
+#, fuzzy, c-format
+msgid "Could not stat '%s'"
+msgstr "gat ekki stat-að '%s'"
+
+#: builtin/add.c:295
+msgid "Empty patch. Aborted."
+msgstr ""
+
+#: builtin/add.c:301
+#, c-format
+msgid "Could not apply '%s'"
+msgstr ""
+
+#: builtin/add.c:310
+msgid "The following paths are ignored by one of your .gitignore files:\n"
+msgstr ""
+
+#: builtin/add.c:350
+#, c-format
+msgid "Use -f if you really want to add them.\n"
+msgstr ""
+
+#: builtin/add.c:351
+msgid "no files added"
+msgstr ""
+
+#: builtin/add.c:357
+msgid "adding files failed"
+msgstr ""
+
+#: builtin/add.c:389
+msgid "-A and -u are mutually incompatible"
+msgstr ""
+
+#: builtin/add.c:391
+msgid "Option --ignore-missing can only be used together with --dry-run"
+msgstr ""
+
+#: builtin/add.c:411
+#, c-format
+msgid "Nothing specified, nothing added.\n"
+msgstr ""
+
+#: builtin/add.c:412
+#, c-format
+msgid "Maybe you wanted to say 'git add .'?\n"
+msgstr ""
+
+#: builtin/add.c:418 builtin/clean.c:95 builtin/commit.c:350 builtin/mv.c:77
+#: builtin/rm.c:162
+msgid "index file corrupt"
+msgstr ""
+
+#: builtin/add.c:470 builtin/mv.c:223 builtin/rm.c:260
+msgid "Unable to write new index file"
+msgstr ""
+
+#: builtin/archive.c:17
+#, c-format
+msgid "could not create archive file '%s'"
+msgstr ""
+
+#: builtin/archive.c:20
+msgid "could not redirect output"
+msgstr ""
+
+#: builtin/archive.c:36
+msgid "git archive: Remote with no URL"
+msgstr ""
+
+#: builtin/archive.c:46
+msgid "git archive: expected ACK/NAK, got EOF"
+msgstr ""
+
+#: builtin/archive.c:51
+#, c-format
+msgid "git archive: NACK %s"
+msgstr ""
+
+#: builtin/archive.c:52
+msgid "git archive: protocol error"
+msgstr ""
+
+#: builtin/archive.c:57
+msgid "git archive: expected a flush"
+msgstr ""
+
+#: builtin/branch.c:136
+#, c-format
+msgid ""
+"deleting branch '%s' that has been merged to\n"
+" '%s', but not yet merged to HEAD."
+msgstr ""
+
+#: builtin/branch.c:140
+#, c-format
+msgid ""
+"not deleting branch '%s' that is not yet merged to\n"
+" '%s', even though it is merged to HEAD."
+msgstr ""
+
+#. TRANSLATORS: This is "remote " in "remote branch '%s' not found"
+#: builtin/branch.c:161
+msgid "remote "
+msgstr ""
+
+#: builtin/branch.c:169
+#, fuzzy
+msgid "cannot use -a with -d"
+msgstr "finn ekki núverandi möppu"
+
+#: builtin/branch.c:175
+msgid "Couldn't look up commit object for HEAD"
+msgstr ""
+
+#: builtin/branch.c:180
+#, c-format
+msgid "Cannot delete the branch '%s' which you are currently on."
+msgstr ""
+
+#: builtin/branch.c:190
+#, c-format
+msgid "%sbranch '%s' not found."
+msgstr ""
+
+#: builtin/branch.c:198
+#, c-format
+msgid "Couldn't look up commit object for '%s'"
+msgstr ""
+
+#: builtin/branch.c:204
+#, c-format
+msgid ""
+"The branch '%s' is not fully merged.\n"
+"If you are sure you want to delete it, run 'git branch -D %s'."
+msgstr ""
+
+#: builtin/branch.c:212
+#, c-format
+msgid "Error deleting %sbranch '%s'"
+msgstr ""
+
+#: builtin/branch.c:217
+#, c-format
+msgid "Deleted %sbranch %s (was %s).\n"
+msgstr ""
+
+#: builtin/branch.c:222
+msgid "Update of config-file failed"
+msgstr ""
+
+#: builtin/branch.c:304
+#, c-format
+msgid "branch '%s' does not point at a commit"
+msgstr ""
+
+#: builtin/branch.c:376
+#, c-format
+msgid "behind %d] "
+msgstr ""
+
+#: builtin/branch.c:378
+#, c-format
+msgid "ahead %d] "
+msgstr ""
+
+#: builtin/branch.c:380
+#, c-format
+msgid "ahead %d, behind %d] "
+msgstr ""
+
+#: builtin/branch.c:483
+msgid "(no branch)"
+msgstr ""
+
+#: builtin/branch.c:543
+msgid "some refs could not be read"
+msgstr ""
+
+#: builtin/branch.c:556
+msgid "cannot rename the current branch while not on any."
+msgstr ""
+
+#: builtin/branch.c:566 builtin/branch.c:570
+#, c-format
+msgid "Invalid branch name: '%s'"
+msgstr ""
+
+#: builtin/branch.c:573
+#, c-format
+msgid "A branch named '%s' already exists."
+msgstr ""
+
+#: builtin/branch.c:579
+msgid "Branch rename failed"
+msgstr ""
+
+#: builtin/branch.c:583
+#, c-format
+msgid "Renamed a misnamed branch '%s' away"
+msgstr ""
+
+#: builtin/branch.c:587
+#, c-format
+msgid "Branch renamed to %s, but HEAD is not updated!"
+msgstr ""
+
+#: builtin/branch.c:594
+msgid "Branch is renamed, but update of config-file failed"
+msgstr ""
+
+#: builtin/branch.c:609
+#, c-format
+msgid "malformed object name %s"
+msgstr ""
+
+#: builtin/branch.c:683
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr ""
+
+#: builtin/branch.c:689
+msgid "HEAD not found below refs/heads!"
+msgstr ""
+
+#: builtin/branch.c:709
+msgid "-a and -r options to 'git branch' do not make sense with a branch name"
+msgstr ""
+
+#: builtin/bundle.c:47
+#, c-format
+msgid "%s is okay\n"
+msgstr ""
+
+#: builtin/bundle.c:56
+msgid "Need a repository to create a bundle."
+msgstr ""
+
+#: builtin/bundle.c:60
+msgid "Need a repository to unbundle."
+msgstr ""
+
+#: builtin/checkout.c:111 builtin/checkout.c:139
+#, c-format
+msgid "path '%s' does not have our version"
+msgstr ""
+
+#: builtin/checkout.c:113 builtin/checkout.c:141
+#, c-format
+msgid "path '%s' does not have their version"
+msgstr ""
+
+#: builtin/checkout.c:124
+#, c-format
+msgid "path '%s' does not have all three versions"
+msgstr ""
+
+#: builtin/checkout.c:159
+#, c-format
+msgid "path '%s' does not have all 3 versions"
+msgstr ""
+
+#: builtin/checkout.c:176
+#, c-format
+msgid "path '%s': cannot merge"
+msgstr ""
+
+#: builtin/checkout.c:193
+#, c-format
+msgid "Unable to add merge result for '%s'"
+msgstr ""
+
+#: builtin/checkout.c:198 builtin/reset.c:170
+#, c-format
+msgid "make_cache_entry failed for path '%s'"
+msgstr ""
+
+#: builtin/checkout.c:220 builtin/checkout.c:374
+msgid "corrupt index file"
+msgstr ""
+
+#: builtin/checkout.c:248 builtin/checkout.c:255
+#, c-format
+msgid "path '%s' is unmerged"
+msgstr ""
+
+#: builtin/checkout.c:284 builtin/checkout.c:478 builtin/clone.c:668
+#: builtin/merge.c:789
+msgid "unable to write new index file"
+msgstr ""
+
+#: builtin/checkout.c:301 builtin/diff.c:301 builtin/merge.c:396
+msgid "diff_setup_done failed"
+msgstr ""
+
+#: builtin/checkout.c:396
+msgid "you need to resolve your current index first"
+msgstr ""
+
+#: builtin/checkout.c:527
+#, fuzzy, c-format
+msgid "Can not do reflog for '%s'\n"
+msgstr "gat ekki opnað möppuna '%s'"
+
+#: builtin/checkout.c:557
+msgid "HEAD is now at"
+msgstr ""
+
+#: builtin/checkout.c:563
+#, c-format
+msgid "Already on '%s'\n"
+msgstr ""
+
+#: builtin/checkout.c:567
+#, c-format
+msgid "Switched to and reset branch '%s'\n"
+msgstr ""
+
+#: builtin/checkout.c:569
+#, c-format
+msgid "Switched to a new branch '%s'\n"
+msgstr ""
+
+#: builtin/checkout.c:571
+#, c-format
+msgid "Switched to branch '%s'\n"
+msgstr ""
+
+#: builtin/checkout.c:651
+#, c-format
+msgid " ... and %d more.\n"
+msgstr ""
+
+#. The singular version
+#: builtin/checkout.c:657
+#, c-format
+msgid ""
+"Warning: you are leaving %d commit behind, not connected to\n"
+"any of your branches:\n"
+"\n"
+"%s\n"
+msgid_plural ""
+"Warning: you are leaving %d commits behind, not connected to\n"
+"any of your branches:\n"
+"\n"
+"%s\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/checkout.c:675
+#, c-format
+msgid ""
+"If you want to keep them by creating a new branch, this may be a good time\n"
+"to do so with:\n"
+"\n"
+" git branch new_branch_name %s\n"
+"\n"
+msgstr ""
+
+#: builtin/checkout.c:700
+msgid "internal error: only -- alone should have been left"
+msgstr ""
+
+#: builtin/checkout.c:702
+msgid "internal error in revision walk"
+msgstr ""
+
+#: builtin/checkout.c:706
+msgid "Previous HEAD position was"
+msgstr ""
+
+#: builtin/checkout.c:731
+msgid "You are on a branch yet to be born"
+msgstr ""
+
+#. case (1)
+#: builtin/checkout.c:859
+#, c-format
+msgid "invalid reference: %s"
+msgstr ""
+
+#. case (1): want a tree
+#: builtin/checkout.c:898
+#, c-format
+msgid "reference is not a tree: %s"
+msgstr ""
+
+#: builtin/checkout.c:965
+msgid "-B cannot be used with -b"
+msgstr ""
+
+#: builtin/checkout.c:974
+msgid "--patch is incompatible with all other options"
+msgstr ""
+
+#: builtin/checkout.c:977
+msgid "--detach cannot be used with -b/-B/--orphan"
+msgstr ""
+
+#: builtin/checkout.c:979
+msgid "--detach cannot be used with -t"
+msgstr ""
+
+#: builtin/checkout.c:985
+msgid "--track needs a branch name"
+msgstr ""
+
+#: builtin/checkout.c:992
+msgid "Missing branch name; try -b"
+msgstr ""
+
+#: builtin/checkout.c:998
+msgid "--orphan and -b|-B are mutually exclusive"
+msgstr ""
+
+#: builtin/checkout.c:1000
+msgid "--orphan cannot be used with -t"
+msgstr ""
+
+#: builtin/checkout.c:1010
+msgid "git checkout: -f and -m are incompatible"
+msgstr ""
+
+#: builtin/checkout.c:1044
+msgid "invalid path specification"
+msgstr ""
+
+#: builtin/checkout.c:1052
+#, c-format
+msgid ""
+"git checkout: updating paths is incompatible with switching branches.\n"
+"Did you intend to checkout '%s' which can not be resolved as commit?"
+msgstr ""
+
+#: builtin/checkout.c:1054
+msgid "git checkout: updating paths is incompatible with switching branches."
+msgstr ""
+
+#: builtin/checkout.c:1059
+msgid "git checkout: --detach does not take a path argument"
+msgstr ""
+
+#: builtin/checkout.c:1062
+msgid ""
+"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
+"checking out of the index."
+msgstr ""
+
+#: builtin/checkout.c:1073
+#, c-format
+msgid "git checkout: we do not like '%s' as a branch name."
+msgstr ""
+
+#: builtin/checkout.c:1078
+#, c-format
+msgid "git checkout: branch %s already exists"
+msgstr ""
+
+#: builtin/checkout.c:1085
+msgid "Cannot switch branch to a non-commit."
+msgstr ""
+
+#: builtin/checkout.c:1088
+msgid "--ours/--theirs is incompatible with switching branches."
+msgstr ""
+
+#: builtin/clean.c:78
+msgid "-x and -X cannot be used together"
+msgstr ""
+
+#: builtin/clean.c:82
+msgid ""
+"clean.requireForce set to true and neither -n nor -f given; refusing to clean"
+msgstr ""
+
+#: builtin/clean.c:85
+msgid ""
+"clean.requireForce defaults to true and neither -n nor -f given; refusing to "
+"clean"
+msgstr ""
+
+#: builtin/clean.c:154 builtin/clean.c:175
+#, c-format
+msgid "Would remove %s\n"
+msgstr ""
+
+#: builtin/clean.c:158 builtin/clean.c:178
+#, c-format
+msgid "Removing %s\n"
+msgstr ""
+
+#: builtin/clean.c:161 builtin/clean.c:181
+#, c-format
+msgid "failed to remove %s"
+msgstr ""
+
+#: builtin/clean.c:165
+#, c-format
+msgid "Would not remove %s\n"
+msgstr ""
+
+#: builtin/clean.c:167
+#, c-format
+msgid "Not removing %s\n"
+msgstr ""
+
+#: builtin/clone.c:214
+#, c-format
+msgid "reference repository '%s' is not a local directory."
+msgstr ""
+
+#: builtin/clone.c:241
+#, fuzzy, c-format
+msgid "failed to open '%s'"
+msgstr "gat ekki opnað möppuna '%s'"
+
+#: builtin/clone.c:245
+#, fuzzy, c-format
+msgid "failed to create directory '%s'"
+msgstr "brjáluð git mappa %s"
+
+#: builtin/clone.c:247 builtin/diff.c:74
+#, fuzzy, c-format
+msgid "failed to stat '%s'"
+msgstr "gat ekki stat-að '%s'"
+
+#: builtin/clone.c:249
+#, fuzzy, c-format
+msgid "%s exists and is not a directory"
+msgstr "brjáluð git mappa %s"
+
+#: builtin/clone.c:263
+#, c-format
+msgid "failed to stat %s\n"
+msgstr ""
+
+#: builtin/clone.c:273
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr ""
+
+#: builtin/clone.c:278
+#, fuzzy, c-format
+msgid "failed to create link '%s'"
+msgstr "gat ekki lesið tengilinn '%s'"
+
+#: builtin/clone.c:282
+#, fuzzy, c-format
+msgid "failed to copy file to '%s'"
+msgstr "gat ekki afritað '%s' til '%s'"
+
+#: builtin/clone.c:311
+#, c-format
+msgid "done.\n"
+msgstr ""
+
+#: builtin/clone.c:394
+msgid "Too many arguments."
+msgstr ""
+
+#: builtin/clone.c:398
+msgid "You must specify a repository to clone."
+msgstr ""
+
+#: builtin/clone.c:406
+#, c-format
+msgid "--bare and --origin %s options are incompatible."
+msgstr ""
+
+#: builtin/clone.c:420
+#, c-format
+msgid "repository '%s' does not exist"
+msgstr ""
+
+#: builtin/clone.c:425
+msgid "--depth is ignored in local clones; use file:// instead."
+msgstr ""
+
+#: builtin/clone.c:435
+#, c-format
+msgid "destination path '%s' already exists and is not an empty directory."
+msgstr ""
+
+#: builtin/clone.c:445
+#, c-format
+msgid "working tree '%s' already exists."
+msgstr ""
+
+#: builtin/clone.c:458 builtin/clone.c:472
+#, c-format
+msgid "could not create leading directories of '%s'"
+msgstr ""
+
+#: builtin/clone.c:461
+#, fuzzy, c-format
+msgid "could not create work tree dir '%s'."
+msgstr "Get ekki opnað tréð '%s'"
+
+#: builtin/clone.c:480
+#, c-format
+msgid "Cloning into bare repository %s...\n"
+msgstr ""
+
+#: builtin/clone.c:482
+#, c-format
+msgid "Cloning into %s...\n"
+msgstr ""
+
+#: builtin/clone.c:540
+#, c-format
+msgid "Don't know how to clone %s"
+msgstr ""
+
+#: builtin/clone.c:579
+#, c-format
+msgid "Remote branch %s not found in upstream %s, using HEAD instead"
+msgstr ""
+
+#: builtin/clone.c:589
+msgid "You appear to have cloned an empty repository."
+msgstr ""
+
+#: builtin/clone.c:631
+msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
+msgstr ""
+
+#: builtin/commit.c:41
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly:\n"
+"\n"
+" git config --global user.name \"Your Name\"\n"
+" git config --global user.email you@example.com\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+" git commit --amend --reset-author\n"
+msgstr ""
+
+#: builtin/commit.c:53
+msgid ""
+"You asked to amend the most recent commit, but doing so would make\n"
+"it empty. You can repeat your command with --allow-empty, or you can\n"
+"remove the commit entirely with \"git reset HEAD^\".\n"
+msgstr ""
+
+#: builtin/commit.c:58
+msgid ""
+"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
+"If you wish to commit it anyway, use:\n"
+"\n"
+" git commit --allow-empty\n"
+"\n"
+"Otherwise, please use 'git reset'\n"
+msgstr ""
+
+#: builtin/commit.c:318
+msgid "failed to unpack HEAD tree object"
+msgstr ""
+
+#: builtin/commit.c:359
+msgid "unable to create temporary index"
+msgstr ""
+
+#: builtin/commit.c:365
+msgid "interactive add failed"
+msgstr ""
+
+#: builtin/commit.c:397 builtin/commit.c:417 builtin/commit.c:463
+msgid "unable to write new_index file"
+msgstr ""
+
+#: builtin/commit.c:447
+#, c-format
+msgid "cannot do a partial commit during a %s."
+msgstr ""
+
+#: builtin/commit.c:456
+#, fuzzy
+msgid "cannot read the index"
+msgstr "gat ekki lesið tengilinn '%s'"
+
+#: builtin/commit.c:476
+msgid "unable to write temporary index file"
+msgstr ""
+
+#: builtin/commit.c:523 builtin/commit.c:1428
+msgid "could not parse HEAD commit"
+msgstr ""
+
+#: builtin/commit.c:542 builtin/commit.c:548
+#, c-format
+msgid "invalid commit: %s"
+msgstr ""
+
+#: builtin/commit.c:566
+msgid "malformed --author parameter"
+msgstr ""
+
+#: builtin/commit.c:622
+#, c-format
+msgid "Malformed ident string: '%s'"
+msgstr ""
+
+#: builtin/commit.c:656 builtin/commit.c:689 builtin/commit.c:989
+#, c-format
+msgid "could not lookup commit %s"
+msgstr ""
+
+#: builtin/commit.c:668 builtin/shortlog.c:296
+#, c-format
+msgid "(reading log message from standard input)\n"
+msgstr ""
+
+#: builtin/commit.c:670
+msgid "could not read log from standard input"
+msgstr ""
+
+#: builtin/commit.c:674
+#, fuzzy, c-format
+msgid "could not read log file '%s'"
+msgstr "gat ekki lesið tengilinn '%s'"
+
+#: builtin/commit.c:680
+msgid "commit has empty message"
+msgstr ""
+
+#: builtin/commit.c:696
+msgid "could not read MERGE_MSG"
+msgstr ""
+
+#: builtin/commit.c:700
+msgid "could not read SQUASH_MSG"
+msgstr ""
+
+#: builtin/commit.c:704
+#, fuzzy, c-format
+msgid "could not read '%s'"
+msgstr "gat ekki lesið tengilinn '%s'"
+
+#: builtin/commit.c:732
+#, fuzzy, c-format
+msgid "could not open '%s'"
+msgstr "gat ekki opnað möppuna '%s'"
+
+#: builtin/commit.c:756
+msgid "could not write commit template"
+msgstr ""
+
+#: builtin/commit.c:769
+#, c-format
+msgid ""
+"\n"
+"It looks like you may be committing a %s.\n"
+"If this is not correct, please remove the file\n"
+"\t%s\n"
+"and try again.\n"
+msgstr ""
+
+#: builtin/commit.c:782
+msgid "Please enter the commit message for your changes."
+msgstr ""
+
+#: builtin/commit.c:785
+msgid ""
+" Lines starting\n"
+"with '#' will be ignored, and an empty message aborts the commit.\n"
+msgstr ""
+
+#: builtin/commit.c:790
+msgid ""
+" Lines starting\n"
+"with '#' will be kept; you may remove them yourself if you want to.\n"
+"An empty message aborts the commit.\n"
+msgstr ""
+
+#: builtin/commit.c:802
+#, c-format
+msgid "%sAuthor: %s"
+msgstr ""
+
+#: builtin/commit.c:809
+#, c-format
+msgid "%sCommitter: %s"
+msgstr ""
+
+#: builtin/commit.c:829
+#, fuzzy
+msgid "Cannot read index"
+msgstr "gat ekki lesið tengilinn '%s'"
+
+#: builtin/commit.c:869
+msgid "Error building trees"
+msgstr ""
+
+#: builtin/commit.c:884 builtin/tag.c:313
+#, c-format
+msgid "Please supply the message using either -m or -F option.\n"
+msgstr ""
+
+#: builtin/commit.c:964
+#, c-format
+msgid "No existing author found with '%s'"
+msgstr ""
+
+#: builtin/commit.c:979 builtin/commit.c:1173
+#, c-format
+msgid "Invalid untracked files mode '%s'"
+msgstr ""
+
+#: builtin/commit.c:1018
+msgid "Using both --reset-author and --author does not make sense"
+msgstr ""
+
+#: builtin/commit.c:1032
+msgid "You have nothing to amend."
+msgstr ""
+
+#: builtin/commit.c:1034
+#, c-format
+msgid "You are in the middle of a %s -- cannot amend."
+msgstr ""
+
+#: builtin/commit.c:1036
+msgid "Options --squash and --fixup cannot be used together"
+msgstr ""
+
+#: builtin/commit.c:1046
+msgid "Only one of -c/-C/-F/--fixup can be used."
+msgstr ""
+
+#: builtin/commit.c:1048
+msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
+msgstr ""
+
+#: builtin/commit.c:1054
+msgid "--reset-author can be used only with -C, -c or --amend."
+msgstr ""
+
+#: builtin/commit.c:1071
+msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
+msgstr ""
+
+#: builtin/commit.c:1073
+msgid "No paths with --include/--only does not make sense."
+msgstr ""
+
+#: builtin/commit.c:1075
+msgid "Clever... amending the last one with dirty index."
+msgstr ""
+
+#: builtin/commit.c:1077
+msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
+msgstr ""
+
+#: builtin/commit.c:1087
+#, c-format
+msgid "Invalid cleanup mode %s"
+msgstr ""
+
+#: builtin/commit.c:1092
+msgid "Paths with -a does not make sense."
+msgstr ""
+
+#: builtin/commit.c:1274
+msgid "couldn't look up newly created commit"
+msgstr ""
+
+#: builtin/commit.c:1276
+msgid "could not parse newly created commit"
+msgstr ""
+
+#: builtin/commit.c:1316
+msgid "detached HEAD"
+msgstr ""
+
+#: builtin/commit.c:1318
+msgid " (root-commit)"
+msgstr ""
+
+#: builtin/commit.c:1441 builtin/merge.c:490
+#, c-format
+msgid "could not open '%s' for reading"
+msgstr ""
+
+#: builtin/commit.c:1446
+#, c-format
+msgid "Corrupt MERGE_HEAD file (%s)"
+msgstr ""
+
+#: builtin/commit.c:1453
+msgid "could not read MERGE_MODE"
+msgstr ""
+
+#: builtin/commit.c:1472
+#, c-format
+msgid "could not read commit message: %s"
+msgstr ""
+
+#: builtin/commit.c:1486
+#, c-format
+msgid "Aborting commit due to empty commit message.\n"
+msgstr ""
+
+#: builtin/commit.c:1493
+msgid "failed to write commit object"
+msgstr ""
+
+#: builtin/commit.c:1511
+msgid "cannot lock HEAD ref"
+msgstr ""
+
+#: builtin/commit.c:1515
+msgid "cannot update HEAD ref"
+msgstr ""
+
+#: builtin/commit.c:1525
+msgid ""
+"Repository has been updated, but unable to write\n"
+"new_index file. Check that disk is not full or quota is\n"
+"not exceeded, and then \"git reset HEAD\" to recover."
+msgstr ""
+
+#: builtin/describe.c:234
+#, c-format
+msgid "annotated tag %s not available"
+msgstr ""
+
+#: builtin/describe.c:238
+#, c-format
+msgid "annotated tag %s has no embedded name"
+msgstr ""
+
+#: builtin/describe.c:240
+#, c-format
+msgid "tag '%s' is really '%s' here"
+msgstr ""
+
+#: builtin/describe.c:267
+#, c-format
+msgid "Not a valid object name %s"
+msgstr ""
+
+#: builtin/describe.c:270
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr ""
+
+#: builtin/describe.c:287
+#, fuzzy, c-format
+msgid "no tag exactly matches '%s'"
+msgstr "gat ekki stat-að sniðið '%s'"
+
+#: builtin/describe.c:289
+#, c-format
+msgid "searching to describe %s\n"
+msgstr ""
+
+#: builtin/describe.c:329
+#, c-format
+msgid "finished search at %s\n"
+msgstr ""
+
+#: builtin/describe.c:353
+#, c-format
+msgid ""
+"No annotated tags can describe '%s'.\n"
+"However, there were unannotated tags: try --tags."
+msgstr ""
+
+#: builtin/describe.c:357
+#, c-format
+msgid ""
+"No tags can describe '%s'.\n"
+"Try --always, or create some tags."
+msgstr ""
+
+#: builtin/describe.c:378
+#, c-format
+msgid "traversed %lu commits\n"
+msgstr ""
+
+#: builtin/describe.c:381
+#, c-format
+msgid ""
+"more than %i tags found; listed %i most recent\n"
+"gave up search at %s\n"
+msgstr ""
+
+#: builtin/describe.c:436
+msgid "--long is incompatible with --abbrev=0"
+msgstr ""
+
+#: builtin/describe.c:462
+msgid "No names found, cannot describe anything."
+msgstr ""
+
+#: builtin/describe.c:469
+msgid "--dirty is incompatible with committishes"
+msgstr ""
+
+#: builtin/diff.c:76
+#, c-format
+msgid "'%s': not a regular file or symlink"
+msgstr ""
+
+#: builtin/diff.c:220
+#, c-format
+msgid "invalid option: %s"
+msgstr ""
+
+#: builtin/diff.c:296
+msgid "Not a git repository"
+msgstr ""
+
+#: builtin/diff.c:346
+#, c-format
+msgid "invalid object '%s' given."
+msgstr ""
+
+#: builtin/diff.c:351
+#, c-format
+msgid "more than %d trees given: '%s'"
+msgstr ""
+
+#: builtin/diff.c:361
+#, c-format
+msgid "more than two blobs given: '%s'"
+msgstr ""
+
+#: builtin/diff.c:369
+#, c-format
+msgid "unhandled object '%s' given."
+msgstr ""
+
+#: builtin/fetch.c:199
+msgid "Couldn't find remote ref HEAD"
+msgstr ""
+
+#: builtin/fetch.c:252
+#, fuzzy, c-format
+msgid "object %s not found"
+msgstr "sniðin funndust ekki %s"
+
+#: builtin/fetch.c:257
+msgid "[up to date]"
+msgstr ""
+
+#.
+#. * If this is the head, and it's not okay to update
+#. * the head, and the old value of the head isn't empty...
+#.
+#: builtin/fetch.c:270
+#, c-format
+msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
+msgstr ""
+
+#: builtin/fetch.c:271 builtin/fetch.c:342
+msgid "[rejected]"
+msgstr ""
+
+#: builtin/fetch.c:281
+msgid "[tag update]"
+msgstr ""
+
+#: builtin/fetch.c:282 builtin/fetch.c:307 builtin/fetch.c:323
+msgid " (unable to update local ref)"
+msgstr ""
+
+#: builtin/fetch.c:294
+msgid "[new tag]"
+msgstr ""
+
+#: builtin/fetch.c:298
+msgid "[new branch]"
+msgstr ""
+
+#: builtin/fetch.c:338
+msgid "unable to update local ref"
+msgstr ""
+
+#: builtin/fetch.c:338
+msgid "forced update"
+msgstr ""
+
+#: builtin/fetch.c:343
+msgid "(non-fast-forward)"
+msgstr ""
+
+#: builtin/fetch.c:361 builtin/fetch.c:684
+#, fuzzy, c-format
+msgid "cannot open %s: %s\n"
+msgstr "gat ekki opnað möppuna '%s'"
+
+#: builtin/fetch.c:439
+#, c-format
+msgid "From %.*s\n"
+msgstr ""
+
+#: builtin/fetch.c:450
+#, c-format
+msgid ""
+"some local refs could not be updated; try running\n"
+" 'git remote prune %s' to remove any old, conflicting branches"
+msgstr ""
+
+#: builtin/fetch.c:500
+msgid "could not run rev-list"
+msgstr ""
+
+#: builtin/fetch.c:514
+#, c-format
+msgid "failed write to rev-list: %s"
+msgstr ""
+
+#: builtin/fetch.c:521
+#, c-format
+msgid "failed to close rev-list's stdin: %s"
+msgstr ""
+
+#: builtin/fetch.c:548
+#, c-format
+msgid " (%s will become dangling)\n"
+msgstr ""
+
+#: builtin/fetch.c:549
+#, c-format
+msgid " (%s has become dangling)\n"
+msgstr ""
+
+#: builtin/fetch.c:556
+msgid "[deleted]"
+msgstr ""
+
+#: builtin/fetch.c:557
+msgid "(none)"
+msgstr ""
+
+#: builtin/fetch.c:674
+#, c-format
+msgid "Refusing to fetch into current branch %s of non-bare repository"
+msgstr ""
+
+#: builtin/fetch.c:708
+#, c-format
+msgid "Don't know how to fetch from %s"
+msgstr ""
+
+#: builtin/fetch.c:762
+#, c-format
+msgid "Option \"%s\" value \"%s\" is not valid for %s"
+msgstr ""
+
+#: builtin/fetch.c:765
+#, c-format
+msgid "Option \"%s\" is ignored for %s\n"
+msgstr ""
+
+#: builtin/fetch.c:864
+#, c-format
+msgid "Fetching %s\n"
+msgstr ""
+
+#: builtin/fetch.c:866
+#, c-format
+msgid "Could not fetch %s"
+msgstr ""
+
+#: builtin/fetch.c:883
+msgid ""
+"No remote repository specified. Please, specify either a URL or a\n"
+"remote name from which new revisions should be fetched."
+msgstr ""
+
+#: builtin/fetch.c:903
+msgid "You need to specify a tag name."
+msgstr ""
+
+#: builtin/fetch.c:946
+msgid "fetch --all does not take a repository argument"
+msgstr ""
+
+#: builtin/fetch.c:948
+msgid "fetch --all does not make sense with refspecs"
+msgstr ""
+
+#: builtin/fetch.c:959
+#, c-format
+msgid "No such remote or remote group: %s"
+msgstr ""
+
+#: builtin/fetch.c:967
+msgid "Fetching a group and specifying refspecs does not make sense"
+msgstr ""
+
+#: builtin/gc.c:63
+#, c-format
+msgid "Invalid %s: '%s'"
+msgstr ""
+
+#: builtin/gc.c:78
+msgid "Too many options specified"
+msgstr ""
+
+#: builtin/gc.c:103
+#, fuzzy, c-format
+msgid "insanely long object directory %.*s"
+msgstr "brjáluð git mappa %s"
+
+#: builtin/gc.c:223
+#, c-format
+msgid "Auto packing the repository for optimum performance.\n"
+msgstr ""
+
+#: builtin/gc.c:226
+#, c-format
+msgid ""
+"Auto packing the repository for optimum performance. You may also\n"
+"run \"git gc\" manually. See \"git help gc\" for more information.\n"
+msgstr ""
+
+#: builtin/gc.c:254
+msgid ""
+"There are too many unreachable loose objects; run 'git prune' to remove them."
+msgstr ""
+
+#: builtin/grep.c:256
+#, c-format
+msgid "grep: failed to create thread: %s"
+msgstr ""
+
+#: builtin/grep.c:374
+#, c-format
+msgid "'%s': unable to read %s"
+msgstr ""
+
+#: builtin/grep.c:425
+#, c-format
+msgid "'%s': %s"
+msgstr ""
+
+#: builtin/grep.c:436
+#, c-format
+msgid "'%s': short read %s"
+msgstr ""
+
+#: builtin/grep.c:498
+#, c-format
+msgid "Failed to chdir: %s"
+msgstr ""
+
+#: builtin/grep.c:573 builtin/grep.c:604
+#, c-format
+msgid "unable to read tree (%s)"
+msgstr ""
+
+#: builtin/grep.c:618
+#, c-format
+msgid "unable to grep from object of type %s"
+msgstr ""
+
+#: builtin/grep.c:674
+#, c-format
+msgid "switch `%c' expects a numerical value"
+msgstr ""
+
+#: builtin/grep.c:691
+#, fuzzy, c-format
+msgid "cannot open '%s'"
+msgstr "gat ekki opnað möppuna '%s'"
+
+#: builtin/grep.c:974
+msgid "no pattern given."
+msgstr ""
+
+#: builtin/grep.c:1001
+#, c-format
+msgid "bad object %s"
+msgstr ""
+
+#: builtin/grep.c:1025
+msgid "--open-files-in-pager only works on the worktree"
+msgstr ""
+
+#: builtin/grep.c:1050
+msgid "--cached cannot be used with --no-index."
+msgstr ""
+
+#: builtin/grep.c:1052
+msgid "--no-index cannot be used with revs."
+msgstr ""
+
+#: builtin/grep.c:1061
+msgid "both --cached and trees are given."
+msgstr ""
+
+#: builtin/init-db.c:35
+#, c-format
+msgid "Could not make %s writable by group"
+msgstr "Gat ekki gert %s skrifanlega af hóp"
+
+#: builtin/init-db.c:62
+#, c-format
+msgid "insanely long template name %s"
+msgstr "brjálæðislega langt sniðsnafn %s"
+
+#: builtin/init-db.c:67
+#, c-format
+msgid "cannot stat '%s'"
+msgstr "gat ekki stat-að '%s'"
+
+#: builtin/init-db.c:73
+#, c-format
+msgid "cannot stat template '%s'"
+msgstr "gat ekki stat-að sniðið '%s'"
+
+#: builtin/init-db.c:80
+#, c-format
+msgid "cannot opendir '%s'"
+msgstr "gat ekki opnað möppuna '%s'"
+
+#: builtin/init-db.c:97
+#, c-format
+msgid "cannot readlink '%s'"
+msgstr "gat ekki lesið tengilinn '%s'"
+
+#: builtin/init-db.c:99
+#, c-format
+msgid "insanely long symlink %s"
+msgstr "brjálæðislega langur tengill %s"
+
+#: builtin/init-db.c:102
+#, c-format
+msgid "cannot symlink '%s' '%s'"
+msgstr "gat ekki búið til tengilinn '%s' '%s'"
+
+#: builtin/init-db.c:106
+#, c-format
+msgid "cannot copy '%s' to '%s'"
+msgstr "gat ekki afritað '%s' til '%s'"
+
+#: builtin/init-db.c:110
+#, c-format
+msgid "ignoring template %s"
+msgstr "hunsa sniðið %s"
+
+#: builtin/init-db.c:133
+#, c-format
+msgid "insanely long template path %s"
+msgstr "brjálæðislega löng slóð á snið %s"
+
+#: builtin/init-db.c:141
+#, c-format
+msgid "templates not found %s"
+msgstr "sniðin funndust ekki %s"
+
+#: builtin/init-db.c:154
+#, c-format
+msgid "not copying templates of a wrong format version %d from '%s'"
+msgstr "afrita ekki sniðin vegna rangar útgáfu %d frá '%s'"
+
+#: builtin/init-db.c:192
+#, c-format
+msgid "insane git directory %s"
+msgstr "brjáluð git mappa %s"
+
+#: builtin/init-db.c:322 builtin/init-db.c:325
+#, c-format
+msgid "%s already exists"
+msgstr ""
+
+#: builtin/init-db.c:354
+#, c-format
+msgid "unable to handle file type %d"
+msgstr ""
+
+#: builtin/init-db.c:357
+#, c-format
+msgid "unable to move %s to %s"
+msgstr ""
+
+#: builtin/init-db.c:362
+#, c-format
+msgid "Could not create git link %s"
+msgstr ""
+
+#.
+#. * TRANSLATORS: The first '%s' is either "Reinitialized
+#. * existing" or "Initialized empty", the second " shared" or
+#. * "", and the last '%s%s' is the verbatim directory name.
+#.
+#: builtin/init-db.c:419
+#, c-format
+msgid "%s%s Git repository in %s%s\n"
+msgstr "%s%s Git lind í %s%s\n"
+
+#: builtin/init-db.c:420
+msgid "Reinitialized existing"
+msgstr "Endurgerði"
+
+#: builtin/init-db.c:420
+msgid "Initialized empty"
+msgstr "Bjó til tóma"
+
+#: builtin/init-db.c:421
+msgid " shared"
+msgstr " sameiginlega"
+
+#: builtin/init-db.c:440
+msgid "cannot tell cwd"
+msgstr "finn ekki núverandi möppu"
+
+#: builtin/init-db.c:521 builtin/init-db.c:528
+#, c-format
+msgid "cannot mkdir %s"
+msgstr "get ekki búið til möppuna %s"
+
+#: builtin/init-db.c:532
+#, c-format
+msgid "cannot chdir to %s"
+msgstr "get ekki farið inn í möppuna %s"
+
+#: builtin/init-db.c:554
+#, c-format
+msgid ""
+"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
+"dir=<directory>)"
+msgstr ""
+"%s (eða --work-tree=<mappa>) ekki leyfilegt ásamt %s (eða --git-dir=<mappa>)"
+
+#: builtin/init-db.c:578
+msgid "Cannot access current working directory"
+msgstr "Get ekki opnað núverandi möppu"
+
+#: builtin/init-db.c:585
+#, c-format
+msgid "Cannot access work tree '%s'"
+msgstr "Get ekki opnað tréð '%s'"
+
+#: builtin/log.c:186
+#, c-format
+msgid "Final output: %d %s\n"
+msgstr ""
+
+#: builtin/log.c:287 builtin/log.c:721 builtin/log.c:1274 builtin/log.c:1492
+#: builtin/merge.c:338 builtin/revert.c:539 builtin/shortlog.c:181
+msgid "revision walk setup failed"
+msgstr ""
+
+#: builtin/log.c:397 builtin/log.c:486
+#, c-format
+msgid "Could not read object %s"
+msgstr ""
+
+#: builtin/log.c:510
+#, c-format
+msgid "Unknown type: %d"
+msgstr ""
+
+#: builtin/log.c:605
+msgid "format.headers without value"
+msgstr ""
+
+#: builtin/log.c:677
+msgid "name of output directory is too long"
+msgstr ""
+
+#: builtin/log.c:688
+#, fuzzy, c-format
+msgid "Cannot open patch file %s"
+msgstr "gat ekki opnað möppuna '%s'"
+
+#: builtin/log.c:702
+msgid "Need exactly one range."
+msgstr ""
+
+#: builtin/log.c:710
+msgid "Not a range."
+msgstr ""
+
+#: builtin/log.c:747
+msgid "Could not extract email from committer identity."
+msgstr ""
+
+#: builtin/log.c:779
+msgid "Cover letter needs email format"
+msgstr ""
+
+#: builtin/log.c:872
+#, fuzzy, c-format
+msgid "insane in-reply-to: %s"
+msgstr "brjáluð git mappa %s"
+
+#: builtin/log.c:945
+msgid "Two output directories?"
+msgstr ""
+
+#: builtin/log.c:1136
+#, c-format
+msgid "bogus committer info %s"
+msgstr ""
+
+#: builtin/log.c:1181
+msgid "-n and -k are mutually exclusive."
+msgstr ""
+
+#: builtin/log.c:1183
+msgid "--subject-prefix and -k are mutually exclusive."
+msgstr ""
+
+#: builtin/log.c:1188 builtin/shortlog.c:284
+#, c-format
+msgid "unrecognized argument: %s"
+msgstr ""
+
+#: builtin/log.c:1191
+msgid "--name-only does not make sense"
+msgstr ""
+
+#: builtin/log.c:1193
+msgid "--name-status does not make sense"
+msgstr ""
+
+#: builtin/log.c:1195
+msgid "--check does not make sense"
+msgstr ""
+
+#: builtin/log.c:1218
+msgid "standard output, or directory, which one?"
+msgstr ""
+
+#: builtin/log.c:1220
+#, c-format
+msgid "Could not create directory '%s'"
+msgstr ""
+
+#: builtin/log.c:1355
+msgid "Failed to create output files"
+msgstr ""
+
+#: builtin/log.c:1458
+#, c-format
+msgid ""
+"Could not find a tracked remote branch, please specify <upstream> manually.\n"
+msgstr ""
+
+#: builtin/log.c:1474 builtin/log.c:1476 builtin/log.c:1488
+#, c-format
+msgid "Unknown commit %s"
+msgstr ""
+
+#: builtin/merge.c:88
+msgid "switch `m' requires a value"
+msgstr ""
+
+#: builtin/merge.c:125
+#, c-format
+msgid "Could not find merge strategy '%s'.\n"
+msgstr ""
+
+#: builtin/merge.c:126
+#, c-format
+msgid "Available strategies are:"
+msgstr ""
+
+#: builtin/merge.c:131
+#, c-format
+msgid "Available custom strategies are:"
+msgstr ""
+
+#: builtin/merge.c:233
+msgid "could not run stash."
+msgstr ""
+
+#: builtin/merge.c:238
+msgid "stash failed"
+msgstr ""
+
+#: builtin/merge.c:243
+#, c-format
+msgid "not a valid object: %s"
+msgstr ""
+
+#: builtin/merge.c:261 builtin/merge.c:278
+msgid "read-tree failed"
+msgstr ""
+
+#: builtin/merge.c:307
+msgid " (nothing to squash)"
+msgstr ""
+
+#: builtin/merge.c:320
+#, c-format
+msgid "Squash commit -- not updating HEAD\n"
+msgstr ""
+
+#: builtin/merge.c:323 builtin/merge.c:844 builtin/merge.c:1430
+#: builtin/merge.c:1442 builtin/revert.c:213
+#, c-format
+msgid "Could not write to '%s'"
+msgstr ""
+
+#: builtin/merge.c:352
+msgid "Writing SQUASH_MSG"
+msgstr ""
+
+#: builtin/merge.c:354
+msgid "Finishing SQUASH_MSG"
+msgstr ""
+
+#: builtin/merge.c:374
+#, c-format
+msgid "No merge message -- not updating HEAD\n"
+msgstr ""
+
+#: builtin/merge.c:425
+#, c-format
+msgid "'%s' does not point to a commit"
+msgstr ""
+
+#: builtin/merge.c:517
+#, c-format
+msgid "Bad branch.%s.mergeoptions string: %s"
+msgstr ""
+
+#: builtin/merge.c:550
+#, c-format
+msgid "%s: negative length %s"
+msgstr ""
+
+#: builtin/merge.c:609
+msgid "git write-tree failed to write a tree"
+msgstr ""
+
+#: builtin/merge.c:659
+msgid "failed to read the cache"
+msgstr ""
+
+#: builtin/merge.c:676
+msgid "Unable to write index."
+msgstr ""
+
+#: builtin/merge.c:689
+msgid "Not handling anything other than two heads merge."
+msgstr ""
+
+#: builtin/merge.c:703
+#, c-format
+msgid "Unknown option for merge-recursive: -X%s"
+msgstr ""
+
+#: builtin/merge.c:717
+#, c-format
+msgid "unable to write %s"
+msgstr ""
+
+#: builtin/merge.c:841 builtin/merge.c:920 builtin/merge.c:1427
+#: builtin/merge.c:1436 builtin/revert.c:210
+#, fuzzy, c-format
+msgid "Could not open '%s' for writing"
+msgstr "Gat ekki gert %s skrifanlega af hóp"
+
+#: builtin/merge.c:852
+#, c-format
+msgid "Could not read from '%s'"
+msgstr ""
+
+#: builtin/merge.c:869
+#, c-format
+msgid "Wonderful.\n"
+msgstr ""
+
+#: builtin/merge.c:936
+#, c-format
+msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
+msgstr ""
+
+#: builtin/merge.c:951
+#, c-format
+msgid "'%s' is not a commit"
+msgstr ""
+
+#: builtin/merge.c:992
+msgid "No current branch."
+msgstr ""
+
+#: builtin/merge.c:994
+msgid "No remote for the current branch."
+msgstr ""
+
+#: builtin/merge.c:996
+msgid "No default upstream defined for the current branch."
+msgstr ""
+
+#: builtin/merge.c:1001
+#, c-format
+msgid "No remote tracking branch for %s from %s"
+msgstr ""
+
+#: builtin/merge.c:1053
+msgid "There is no merge to abort (MERGE_HEAD missing)."
+msgstr ""
+
+#: builtin/merge.c:1068 git-pull.sh:31
+msgid ""
+"You have not concluded your merge (MERGE_HEAD exists).\n"
+"Please, commit your changes before you can merge."
+msgstr ""
+
+#: builtin/merge.c:1071 git-pull.sh:34
+msgid "You have not concluded your merge (MERGE_HEAD exists)."
+msgstr ""
+
+#: builtin/merge.c:1075
+msgid ""
+"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
+"Please, commit your changes before you can merge."
+msgstr ""
+
+#: builtin/merge.c:1078
+msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
+msgstr ""
+
+#: builtin/merge.c:1087
+msgid "You cannot combine --squash with --no-ff."
+msgstr ""
+
+#: builtin/merge.c:1092
+msgid "You cannot combine --no-ff with --ff-only."
+msgstr ""
+
+#: builtin/merge.c:1126
+msgid "Can merge only exactly one commit into empty head"
+msgstr ""
+
+#: builtin/merge.c:1129
+msgid "Squash commit into empty head not supported yet"
+msgstr ""
+
+#: builtin/merge.c:1131
+msgid "Non-fast-forward commit does not make sense into an empty head"
+msgstr ""
+
+#: builtin/merge.c:1135 builtin/merge.c:1181
+#, c-format
+msgid "%s - not something we can merge"
+msgstr ""
+
+#: builtin/merge.c:1239
+#, c-format
+msgid "Updating %s..%s\n"
+msgstr ""
+
+#: builtin/merge.c:1273
+#, c-format
+msgid "Trying really trivial in-index merge...\n"
+msgstr ""
+
+#: builtin/merge.c:1277
+#, c-format
+msgid "Nope.\n"
+msgstr ""
+
+#: builtin/merge.c:1310
+msgid "Not possible to fast-forward, aborting."
+msgstr ""
+
+#: builtin/merge.c:1336 builtin/merge.c:1409
+#, c-format
+msgid "Rewinding the tree to pristine...\n"
+msgstr ""
+
+#: builtin/merge.c:1340
+#, c-format
+msgid "Trying merge strategy %s...\n"
+msgstr ""
+
+#: builtin/merge.c:1401
+#, c-format
+msgid "No merge strategy handled the merge.\n"
+msgstr ""
+
+#: builtin/merge.c:1403
+#, c-format
+msgid "Merge with strategy %s failed.\n"
+msgstr ""
+
+#: builtin/merge.c:1411
+#, c-format
+msgid "Using the %s to prepare resolving by hand.\n"
+msgstr ""
+
+#: builtin/merge.c:1447
+#, c-format
+msgid "Automatic merge went well; stopped before committing as requested\n"
+msgstr ""
+
+#: builtin/mv.c:103
+#, fuzzy, c-format
+msgid "Checking rename of '%s' to '%s'\n"
+msgstr "gat ekki afritað '%s' til '%s'"
+
+#: builtin/mv.c:107
+msgid "bad source"
+msgstr ""
+
+#: builtin/mv.c:110
+msgid "can not move directory into itself"
+msgstr ""
+
+#: builtin/mv.c:113
+msgid "cannot move directory over file"
+msgstr ""
+
+#: builtin/mv.c:123
+#, c-format
+msgid "Huh? %.*s is in index?"
+msgstr ""
+
+#: builtin/mv.c:135
+msgid "source directory is empty"
+msgstr ""
+
+#: builtin/mv.c:166
+msgid "not under version control"
+msgstr ""
+
+#: builtin/mv.c:168
+msgid "destination exists"
+msgstr ""
+
+#: builtin/mv.c:175
+#, c-format
+msgid "%s; will overwrite!"
+msgstr ""
+
+#: builtin/mv.c:178
+msgid "Cannot overwrite"
+msgstr ""
+
+#: builtin/mv.c:181
+msgid "multiple sources for the same target"
+msgstr ""
+
+#: builtin/mv.c:196
+#, c-format
+msgid "%s, source=%s, destination=%s"
+msgstr ""
+
+#: builtin/mv.c:206
+#, c-format
+msgid "Renaming %s to %s\n"
+msgstr ""
+
+#: builtin/mv.c:209
+#, c-format
+msgid "renaming '%s' failed"
+msgstr ""
+
+#: builtin/notes.c:139
+#, c-format
+msgid "unable to start 'show' for object '%s'"
+msgstr ""
+
+#: builtin/notes.c:145
+msgid "can't fdopen 'show' output fd"
+msgstr ""
+
+#: builtin/notes.c:155
+#, c-format
+msgid "failed to close pipe to 'show' for object '%s'"
+msgstr ""
+
+#: builtin/notes.c:158
+#, c-format
+msgid "failed to finish 'show' for object '%s'"
+msgstr ""
+
+#: builtin/notes.c:175 builtin/tag.c:303
+#, fuzzy, c-format
+msgid "could not create file '%s'"
+msgstr "gat ekki lesið tengilinn '%s'"
+
+#: builtin/notes.c:189
+msgid "Please supply the note contents using either -m or -F option"
+msgstr ""
+
+#: builtin/notes.c:210 builtin/notes.c:968
+#, c-format
+msgid "Removing note for object %s\n"
+msgstr ""
+
+#: builtin/notes.c:215
+msgid "unable to write note object"
+msgstr ""
+
+#: builtin/notes.c:217
+#, c-format
+msgid "The note contents has been left in %s"
+msgstr ""
+
+#: builtin/notes.c:251 builtin/tag.c:448
+#, fuzzy, c-format
+msgid "cannot read '%s'"
+msgstr "gat ekki lesið tengilinn '%s'"
+
+#: builtin/notes.c:253 builtin/tag.c:451
+#, fuzzy, c-format
+msgid "could not open or read '%s'"
+msgstr "gat ekki opnað möppuna '%s'"
+
+#: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447
+#: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644
+#: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766
+#: builtin/notes.c:963 builtin/reset.c:303 builtin/tag.c:464
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr ""
+
+#: builtin/notes.c:275
+#, c-format
+msgid "Failed to read object '%s'."
+msgstr ""
+
+#: builtin/notes.c:299
+msgid "Cannot commit uninitialized/unreferenced notes tree"
+msgstr ""
+
+#: builtin/notes.c:340
+#, c-format
+msgid "Bad notes.rewriteMode value: '%s'"
+msgstr ""
+
+#: builtin/notes.c:350
+#, c-format
+msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
+msgstr ""
+
+#. TRANSLATORS: The first %s is the name of the
+#. environment variable, the second %s is its value
+#: builtin/notes.c:377
+#, c-format
+msgid "Bad %s value: '%s'"
+msgstr ""
+
+#: builtin/notes.c:441
+#, c-format
+msgid "Malformed input line: '%s'."
+msgstr ""
+
+#: builtin/notes.c:456
+#, fuzzy, c-format
+msgid "Failed to copy notes from '%s' to '%s'"
+msgstr "gat ekki afritað '%s' til '%s'"
+
+#: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627
+#: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759
+#: builtin/notes.c:1028
+msgid "too many parameters"
+msgstr ""
+
+#: builtin/notes.c:513 builtin/notes.c:772
+#, c-format
+msgid "No note found for object %s."
+msgstr ""
+
+#: builtin/notes.c:580
+#, c-format
+msgid ""
+"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
+msgstr ""
+
+#: builtin/notes.c:585 builtin/notes.c:662
+#, c-format
+msgid "Overwriting existing notes for object %s\n"
+msgstr ""
+
+#: builtin/notes.c:635
+msgid "too few parameters"
+msgstr ""
+
+#: builtin/notes.c:656
+#, c-format
+msgid ""
+"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
+msgstr ""
+
+#: builtin/notes.c:668
+#, c-format
+msgid "Missing notes on source object %s. Cannot copy."
+msgstr ""
+
+#: builtin/notes.c:717
+#, c-format
+msgid ""
+"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
+"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
+msgstr ""
+
+#: builtin/notes.c:966
+#, c-format
+msgid "Object %s has no note\n"
+msgstr ""
+
+#: builtin/notes.c:1098
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr ""
+
+#: builtin/push.c:43
+msgid "tag shorthand without <tag>"
+msgstr ""
+
+#: builtin/push.c:62
+msgid "--delete only accepts plain target ref names"
+msgstr ""
+
+#: builtin/push.c:72
+#, c-format
+msgid ""
+"You are not currently on a branch.\n"
+"To push the history leading to the current (detached HEAD)\n"
+"state now, use\n"
+"\n"
+" git push %s HEAD:<name-of-remote-branch>\n"
+msgstr ""
+
+#: builtin/push.c:79
+#, c-format
+msgid ""
+"The current branch %s has no upstream branch.\n"
+"To push the current branch and set the remote as upstream, use\n"
+"\n"
+" git push --set-upstream %s %s\n"
+msgstr ""
+
+#: builtin/push.c:87
+#, c-format
+msgid "The current branch %s has multiple upstream branches, refusing to push."
+msgstr ""
+
+#: builtin/push.c:110
+msgid ""
+"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+msgstr ""
+
+#: builtin/push.c:130
+#, c-format
+msgid "Pushing to %s\n"
+msgstr ""
+
+#: builtin/push.c:134
+#, c-format
+msgid "failed to push some refs to '%s'"
+msgstr ""
+
+#: builtin/push.c:142
+#, c-format
+msgid ""
+"To prevent you from losing history, non-fast-forward updates were rejected\n"
+"Merge the remote changes (e.g. 'git pull') before pushing again. See the\n"
+"'Note about fast-forwards' section of 'git push --help' for details.\n"
+msgstr ""
+
+#: builtin/push.c:159
+#, c-format
+msgid "bad repository '%s'"
+msgstr ""
+
+#: builtin/push.c:160
+msgid ""
+"No configured push destination.\n"
+"Either specify the URL from the command-line or configure a remote "
+"repository using\n"
+"\n"
+" git remote add <name> <url>\n"
+"\n"
+"and then push using the remote name\n"
+"\n"
+" git push <name>\n"
+msgstr ""
+
+#: builtin/push.c:175
+msgid "--all and --tags are incompatible"
+msgstr ""
+
+#: builtin/push.c:176
+msgid "--all can't be combined with refspecs"
+msgstr ""
+
+#: builtin/push.c:181
+msgid "--mirror and --tags are incompatible"
+msgstr ""
+
+#: builtin/push.c:182
+msgid "--mirror can't be combined with refspecs"
+msgstr ""
+
+#: builtin/push.c:187
+msgid "--all and --mirror are incompatible"
+msgstr ""
+
+#: builtin/push.c:253
+msgid "--delete is incompatible with --all, --mirror and --tags"
+msgstr ""
+
+#: builtin/push.c:255
+msgid "--delete doesn't make sense without any refs"
+msgstr ""
+
+#: builtin/reset.c:33
+msgid "mixed"
+msgstr ""
+
+#: builtin/reset.c:33
+msgid "soft"
+msgstr ""
+
+#: builtin/reset.c:33
+msgid "hard"
+msgstr ""
+
+#: builtin/reset.c:33
+msgid "merge"
+msgstr ""
+
+#: builtin/reset.c:33
+msgid "keep"
+msgstr ""
+
+#: builtin/reset.c:95
+msgid "You do not have a valid HEAD."
+msgstr ""
+
+#: builtin/reset.c:97
+msgid "Failed to find tree of HEAD."
+msgstr ""
+
+#: builtin/reset.c:103
+#, c-format
+msgid "Failed to find tree of %s."
+msgstr ""
+
+#: builtin/reset.c:108
+msgid "Could not write new index file."
+msgstr ""
+
+#: builtin/reset.c:118
+#, c-format
+msgid "HEAD is now at %s"
+msgstr ""
+
+#: builtin/reset.c:142
+msgid "Could not read index"
+msgstr ""
+
+#: builtin/reset.c:145
+msgid "Unstaged changes after reset:"
+msgstr ""
+
+#: builtin/reset.c:225
+#, c-format
+msgid "Reflog action message too long: %.*s..."
+msgstr ""
+
+#: builtin/reset.c:231
+#, c-format
+msgid "Cannot do a %s reset in the middle of a merge."
+msgstr ""
+
+#: builtin/reset.c:307
+#, c-format
+msgid "Could not parse object '%s'."
+msgstr ""
+
+#: builtin/reset.c:312
+msgid "--patch is incompatible with --{hard,mixed,soft}"
+msgstr ""
+
+#: builtin/reset.c:321
+msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
+msgstr ""
+
+#: builtin/reset.c:323
+#, c-format
+msgid "Cannot do %s reset with paths."
+msgstr ""
+
+#: builtin/reset.c:335
+#, c-format
+msgid "%s reset is not allowed in a bare repository"
+msgstr ""
+
+#: builtin/reset.c:351
+#, c-format
+msgid "Could not reset index file to revision '%s'."
+msgstr ""
+
+#: builtin/revert.c:99
+msgid "program error"
+msgstr ""
+
+#: builtin/revert.c:171
+#, c-format
+msgid "Could not read commit message of %s"
+msgstr ""
+
+#: builtin/revert.c:253
+#, c-format
+msgid "Could not write to %s."
+msgstr ""
+
+#: builtin/revert.c:256
+#, c-format
+msgid "Error wrapping up %s"
+msgstr ""
+
+#: builtin/revert.c:276
+msgid ""
+"Your local changes would be overwritten by revert.\n"
+"Please, commit your changes or stash them to proceed."
+msgstr ""
+
+#: builtin/revert.c:279
+msgid ""
+"Your local changes would be overwritten by cherry-pick.\n"
+"Please, commit your changes or stash them to proceed."
+msgstr ""
+
+#: builtin/revert.c:283
+msgid "Your local changes would be overwritten by revert.\n"
+msgstr ""
+
+#: builtin/revert.c:285
+msgid "Your local changes would be overwritten by cherry-pick.\n"
+msgstr ""
+
+#. TRANSLATORS: %s will be "revert" or "cherry-pick"
+#: builtin/revert.c:335
+#, c-format
+msgid "%s: Unable to write new index file"
+msgstr ""
+
+#: builtin/revert.c:401
+msgid "Your index file is unmerged."
+msgstr ""
+
+#: builtin/revert.c:404
+msgid "You do not have a valid HEAD"
+msgstr ""
+
+#: builtin/revert.c:419
+#, c-format
+msgid "Commit %s is a merge but no -m option was given."
+msgstr ""
+
+#: builtin/revert.c:427
+#, c-format
+msgid "Commit %s does not have parent %d"
+msgstr ""
+
+#: builtin/revert.c:431
+#, c-format
+msgid "Mainline was specified but commit %s is not a merge."
+msgstr ""
+
+#. TRANSLATORS: The first %s will be "revert" or
+#. "cherry-pick", the second %s a SHA1
+#: builtin/revert.c:442
+#, c-format
+msgid "%s: cannot parse parent commit %s"
+msgstr ""
+
+#: builtin/revert.c:446
+#, c-format
+msgid "Cannot get commit message for %s"
+msgstr ""
+
+#: builtin/revert.c:508
+#, c-format
+msgid "could not revert %s... %s"
+msgstr ""
+
+#: builtin/revert.c:509
+#, c-format
+msgid "could not apply %s... %s"
+msgstr ""
+
+#: builtin/revert.c:542
+msgid "empty commit set passed"
+msgstr ""
+
+#: builtin/revert.c:550
+#, c-format
+msgid "git %s: failed to read the index"
+msgstr ""
+
+#: builtin/revert.c:555
+#, c-format
+msgid "git %s: failed to refresh the index"
+msgstr ""
+
+#: builtin/revert.c:571
+msgid "cherry-pick --ff cannot be used with --signoff"
+msgstr ""
+
+#: builtin/revert.c:573
+msgid "cherry-pick --ff cannot be used with --no-commit"
+msgstr ""
+
+#: builtin/revert.c:575
+msgid "cherry-pick --ff cannot be used with -x"
+msgstr ""
+
+#: builtin/revert.c:577
+msgid "cherry-pick --ff cannot be used with --edit"
+msgstr ""
+
+#: builtin/rm.c:109
+#, c-format
+msgid ""
+"'%s' has staged content different from both the file and the HEAD\n"
+"(use -f to force removal)"
+msgstr ""
+
+#: builtin/rm.c:115
+#, c-format
+msgid ""
+"'%s' has changes staged in the index\n"
+"(use --cached to keep the file, or -f to force removal)"
+msgstr ""
+
+#: builtin/rm.c:119
+#, c-format
+msgid ""
+"'%s' has local modifications\n"
+"(use --cached to keep the file, or -f to force removal)"
+msgstr ""
+
+#: builtin/rm.c:194
+#, c-format
+msgid "not removing '%s' recursively without -r"
+msgstr ""
+
+#: builtin/rm.c:230
+#, c-format
+msgid "git rm: unable to remove %s"
+msgstr ""
+
+#: builtin/shortlog.c:157
+#, c-format
+msgid "Missing author: %s"
+msgstr ""
+
+#: builtin/tag.c:121
+#, c-format
+msgid "tag name too long: %.*s..."
+msgstr ""
+
+#: builtin/tag.c:126
+#, fuzzy, c-format
+msgid "tag '%s' not found."
+msgstr "sniðin funndust ekki %s"
+
+#: builtin/tag.c:141
+#, c-format
+msgid "Deleted tag '%s' (was %s)\n"
+msgstr ""
+
+#: builtin/tag.c:153
+#, c-format
+msgid "could not verify the tag '%s'"
+msgstr ""
+
+#: builtin/tag.c:168
+msgid "committer info too long."
+msgstr ""
+
+#: builtin/tag.c:188
+msgid "could not run gpg."
+msgstr ""
+
+#: builtin/tag.c:194
+msgid "gpg did not accept the tag data"
+msgstr ""
+
+#: builtin/tag.c:201
+msgid "gpg failed to sign the tag"
+msgstr ""
+
+#: builtin/tag.c:216
+msgid ""
+"\n"
+"#\n"
+"# Write a tag message\n"
+"#\n"
+msgstr ""
+
+#: builtin/tag.c:224
+#, c-format
+msgid "signing key value too long (%.10s...)"
+msgstr ""
+
+#: builtin/tag.c:264
+msgid "unable to sign the tag"
+msgstr ""
+
+#: builtin/tag.c:266
+msgid "unable to write tag file"
+msgstr ""
+
+#: builtin/tag.c:281
+msgid "bad object type."
+msgstr ""
+
+#: builtin/tag.c:294
+msgid "tag header too big."
+msgstr ""
+
+#: builtin/tag.c:321
+msgid "no tag message?"
+msgstr ""
+
+#: builtin/tag.c:327
+#, c-format
+msgid "The tag message has been left in %s\n"
+msgstr ""
+
+#: builtin/tag.c:431
+msgid "-n option is only allowed with -l."
+msgstr ""
+
+#: builtin/tag.c:433
+msgid "--contains option is only allowed with -l."
+msgstr ""
+
+#: builtin/tag.c:441
+msgid "only one -F or -m option is allowed."
+msgstr ""
+
+#: builtin/tag.c:461
+msgid "too many params"
+msgstr ""
+
+#: builtin/tag.c:467
+#, c-format
+msgid "'%s' is not a valid tag name."
+msgstr ""
+
+#: builtin/tag.c:472
+#, c-format
+msgid "tag '%s' already exists"
+msgstr ""
+
+#: builtin/tag.c:480
+#, c-format
+msgid "%s: cannot lock the ref"
+msgstr ""
+
+#: builtin/tag.c:482
+#, c-format
+msgid "%s: cannot update the ref"
+msgstr ""
+
+#: builtin/tag.c:484
+#, c-format
+msgid "Updated tag '%s' (was %s)\n"
+msgstr ""
+
+#: git-am.sh:47
+msgid "You need to set your committer info first"
+msgstr ""
+
+#: git-am.sh:93
+msgid ""
+"You seem to have moved HEAD since the last 'am' failure.\n"
+"Not rewinding to ORIG_HEAD"
+msgstr ""
+
+#: git-am.sh:105
+#, sh-format
+msgid ""
+"When you have resolved this problem run \"$cmdline --resolved\".\n"
+"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
+"To restore the original branch and stop patching run \"$cmdline --abort\"."
+msgstr ""
+
+#: git-am.sh:121
+msgid "Cannot fall back to three-way merge."
+msgstr ""
+
+#: git-am.sh:136
+msgid "Repository lacks necessary blobs to fall back on 3-way merge."
+msgstr ""
+
+#: git-am.sh:145
+msgid ""
+"Did you hand edit your patch?\n"
+"It does not apply to blobs recorded in its index."
+msgstr ""
+
+#: git-am.sh:154
+msgid "Falling back to patching base and 3-way merge..."
+msgstr ""
+
+#: git-am.sh:261
+msgid "Only one StGIT patch series can be applied at once"
+msgstr ""
+
+#: git-am.sh:313
+#, sh-format
+msgid "Patch format $patch_format is not supported."
+msgstr ""
+
+#: git-am.sh:315
+msgid "Patch format detection failed."
+msgstr ""
+
+#: git-am.sh:365
+msgid "-d option is no longer supported. Do not use."
+msgstr ""
+
+#: git-am.sh:428
+#, sh-format
+msgid "previous rebase directory $dotest still exists but mbox given."
+msgstr ""
+
+#: git-am.sh:433
+msgid "Please make up your mind. --skip or --abort?"
+msgstr ""
+
+#: git-am.sh:460
+msgid "Resolve operation not in progress, we are not resuming."
+msgstr ""
+
+#: git-am.sh:525
+#, sh-format
+msgid "Dirty index: cannot apply patches (dirty: $files)"
+msgstr ""
+
+#: git-am.sh:614
+#, sh-format
+msgid ""
+"Patch is empty. Was it split wrong?\n"
+"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
+"To restore the original branch and stop patching run \"$cmdline --abort\"."
+msgstr ""
+
+#: git-am.sh:651
+msgid "Patch does not have a valid e-mail address."
+msgstr ""
+
+#: git-am.sh:698
+msgid "cannot be interactive without stdin connected to a terminal."
+msgstr ""
+
+#: git-am.sh:702
+msgid "Commit Body is:"
+msgstr ""
+
+#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
+#. in your translation. The program will only accept English
+#. input at this point.
+#: git-am.sh:709
+msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
+msgstr ""
+
+#: git-am.sh:745
+#, sh-format
+msgid "Applying: $FIRSTLINE"
+msgstr ""
+
+#: git-am.sh:766
+msgid ""
+"No changes - did you forget to use 'git add'?\n"
+"If there is nothing left to stage, chances are that something else\n"
+"already introduced the same changes; you might want to skip this patch."
+msgstr ""
+
+#: git-am.sh:774
+msgid ""
+"You still have unmerged paths in your index\n"
+"did you forget to use 'git add'?"
+msgstr ""
+
+#: git-am.sh:790
+msgid "No changes -- Patch already applied."
+msgstr ""
+
+#: git-am.sh:800
+#, sh-format
+msgid "Patch failed at $msgnum $FIRSTLINE"
+msgstr ""
+
+#: git-am.sh:816
+msgid "applying to an empty history"
+msgstr ""
+
+#: git-bisect.sh:40
+msgid "You need to start by \"git bisect start\""
+msgstr ""
+
+#. TRANSLATORS: Make sure to include [Y] and [n] in your
+#. translation. The program will only accept English input
+#. at this point.
+#: git-bisect.sh:48
+msgid "Do you want me to do it for you [Y/n]? "
+msgstr ""
+
+#: git-bisect.sh:67
+msgid "Bad HEAD - I need a HEAD"
+msgstr ""
+
+#: git-bisect.sh:86
+msgid "won't bisect on seeked tree"
+msgstr ""
+
+#: git-bisect.sh:90
+msgid "Bad HEAD - strange symbolic ref"
+msgstr ""
+
+#: git-bisect.sh:120
+#, sh-format
+msgid "'$arg' does not appear to be a valid revision"
+msgstr ""
+
+#: git-bisect.sh:165
+#, sh-format
+msgid "Bad bisect_write argument: $state"
+msgstr ""
+
+#: git-bisect.sh:193
+#, sh-format
+msgid "Bad rev input: $arg"
+msgstr ""
+
+#: git-bisect.sh:207
+msgid "Please call 'bisect_state' with at least one argument."
+msgstr ""
+
+#: git-bisect.sh:210
+msgid "Bad rev input: HEAD"
+msgstr ""
+
+#: git-bisect.sh:219
+#, sh-format
+msgid "Bad rev input: $rev"
+msgstr ""
+
+#: git-bisect.sh:225
+msgid "'git bisect bad' can take only one argument."
+msgstr ""
+
+#. have bad but not good. we could bisect although
+#. this is less optimum.
+#: git-bisect.sh:249
+msgid "Warning: bisecting only with a bad commit."
+msgstr ""
+
+#. TRANSLATORS: Make sure to include [Y] and [n] in your
+#. translation. The program will only accept English input
+#. at this point.
+#: git-bisect.sh:257
+msgid "Are you sure [Y/n]? "
+msgstr ""
+
+#: git-bisect.sh:268
+msgid ""
+"You need to give me at least one good and one bad revisions.\n"
+"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
+msgstr ""
+
+#: git-bisect.sh:274
+msgid ""
+"You need to start by \"git bisect start\".\n"
+"You then need to give me at least one good and one bad revisions.\n"
+"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
+msgstr ""
+
+#: git-bisect.sh:330 git-bisect.sh:457
+msgid "We are not bisecting."
+msgstr ""
+
+#: git-bisect.sh:337
+#, sh-format
+msgid "'$invalid' is not a valid commit"
+msgstr ""
+
+#: git-bisect.sh:346
+#, sh-format
+msgid ""
+"Could not check out original HEAD '$branch'.\n"
+"Try 'git bisect reset <commit>'."
+msgstr ""
+
+#: git-bisect.sh:371
+msgid "No logfile given"
+msgstr ""
+
+#: git-bisect.sh:372
+#, sh-format
+msgid "cannot read $file for replaying"
+msgstr ""
+
+#: git-bisect.sh:388
+msgid "?? what are you talking about?"
+msgstr ""
+
+#: git-bisect.sh:400
+#, sh-format
+msgid "running $command"
+msgstr ""
+
+#: git-bisect.sh:407
+#, sh-format
+msgid ""
+"bisect run failed:\n"
+"exit code $res from '$command' is < 0 or >= 128"
+msgstr ""
+
+#: git-bisect.sh:433
+msgid "bisect run cannot continue any more"
+msgstr ""
+
+#: git-bisect.sh:441
+#, sh-format
+msgid ""
+"bisect run failed:\n"
+"'bisect_state $state' exited with error code $res"
+msgstr ""
+
+#: git-bisect.sh:449
+msgid "bisect run success"
+msgstr ""
+
+#: git-pull.sh:21
+msgid ""
+"Pull is not possible because you have unmerged files.\n"
+"Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
+"as appropriate to mark resolution, or use 'git commit -a'."
+msgstr ""
+
+#: git-pull.sh:25
+msgid "Pull is not possible because you have unmerged files."
+msgstr ""
+
+#: git-pull.sh:189
+msgid "updating an unborn branch with changes added to the index"
+msgstr ""
+
+#. The fetch involved updating the current branch.
+#. The working tree and the index file is still based on the
+#. $orig_head commit, but we are merging into $curr_head.
+#. First update the working tree to match $curr_head.
+#: git-pull.sh:221
+#, sh-format
+msgid ""
+"Warning: fetch updated the current branch head.\n"
+"Warning: fast-forwarding your working tree from\n"
+"Warning: commit $orig_head."
+msgstr ""
+
+#: git-pull.sh:248
+msgid "Cannot merge multiple branches into empty head"
+msgstr ""
+
+#: git-pull.sh:252
+msgid "Cannot rebase onto multiple branches"
+msgstr ""
+
+#: git-stash.sh:43
+msgid "git stash clear with parameters is unimplemented"
+msgstr ""
+
+#: git-stash.sh:65
+msgid "You do not have the initial commit yet"
+msgstr ""
+
+#: git-stash.sh:80
+#, fuzzy
+msgid "Cannot save the current index state"
+msgstr "Get ekki opnað núverandi möppu"
+
+#: git-stash.sh:94 git-stash.sh:107
+#, fuzzy
+msgid "Cannot save the current worktree state"
+msgstr "Get ekki opnað núverandi möppu"
+
+#: git-stash.sh:111
+msgid "No changes selected"
+msgstr ""
+
+#: git-stash.sh:114
+msgid "Cannot remove temporary index (can't happen)"
+msgstr ""
+
+#: git-stash.sh:127
+#, fuzzy
+msgid "Cannot record working tree state"
+msgstr "Get ekki opnað tréð '%s'"
+
+#: git-stash.sh:182
+msgid "No local changes to save"
+msgstr ""
+
+#: git-stash.sh:186
+msgid "Cannot initialize stash"
+msgstr ""
+
+#: git-stash.sh:194
+msgid "Cannot save the current status"
+msgstr ""
+
+#: git-stash.sh:207
+#, fuzzy
+msgid "Cannot remove worktree changes"
+msgstr "Get ekki opnað tréð '%s'"
+
+#: git-stash.sh:302
+msgid "No stash found."
+msgstr ""
+
+#: git-stash.sh:309
+#, sh-format
+msgid "Too many revisions specified: $REV"
+msgstr ""
+
+#: git-stash.sh:315
+#, sh-format
+msgid "$reference is not valid reference"
+msgstr ""
+
+#: git-stash.sh:340
+#, sh-format
+msgid "'$args' is not a stash-like commit"
+msgstr ""
+
+#: git-stash.sh:351
+#, sh-format
+msgid "'$args' is not a stash reference"
+msgstr ""
+
+#: git-stash.sh:359
+msgid "unable to refresh index"
+msgstr ""
+
+#: git-stash.sh:363
+msgid "Cannot apply a stash in the middle of a merge"
+msgstr ""
+
+#: git-stash.sh:371
+msgid "Conflicts in index. Try without --index."
+msgstr ""
+
+#: git-stash.sh:373
+msgid "Could not save index tree"
+msgstr ""
+
+#: git-stash.sh:399
+msgid "Cannot unstage modified files"
+msgstr ""
+
+#: git-stash.sh:414
+msgid "Index was not unstashed."
+msgstr ""
+
+#: git-stash.sh:433
+#, sh-format
+msgid "Dropped ${REV} ($s)"
+msgstr ""
+
+#: git-stash.sh:434
+#, sh-format
+msgid "${REV}: Could not drop stash entry"
+msgstr ""
+
+#: git-stash.sh:441
+msgid "No branch name specified"
+msgstr ""
+
+#: git-stash.sh:512
+msgid "(To restore them type \"git stash apply\")"
+msgstr ""
+
+#: git-submodule.sh:38
+#, sh-format
+msgid "remote ($remote) does not have a url defined in .git/config"
+msgstr ""
+
+#: git-submodule.sh:56
+#, sh-format
+msgid "cannot strip one component off url '$remoteurl'"
+msgstr ""
+
+#: git-submodule.sh:108
+#, sh-format
+msgid "No submodule mapping found in .gitmodules for path '$path'"
+msgstr ""
+
+#: git-submodule.sh:132
+#, sh-format
+msgid "Clone of '$url' into submodule path '$path' failed"
+msgstr ""
+
+#: git-submodule.sh:205
+#, sh-format
+msgid "repo URL: '$repo' must be absolute or begin with ./|../"
+msgstr ""
+
+#: git-submodule.sh:222
+#, sh-format
+msgid "'$path' already exists in the index"
+msgstr ""
+
+#: git-submodule.sh:227
+#, sh-format
+msgid ""
+"The following path is ignored by one of your .gitignore files:\n"
+"$path\n"
+"Use -f if you really want to add it."
+msgstr ""
+
+#: git-submodule.sh:240
+#, sh-format
+msgid "Adding existing repo at '$path' to the index"
+msgstr ""
+
+#: git-submodule.sh:242
+#, sh-format
+msgid "'$path' already exists and is not a valid git repo"
+msgstr ""
+
+#: git-submodule.sh:265
+#, sh-format
+msgid "Unable to checkout submodule '$path'"
+msgstr ""
+
+#: git-submodule.sh:269
+#, sh-format
+msgid "Failed to add submodule '$path'"
+msgstr ""
+
+#: git-submodule.sh:274
+#, sh-format
+msgid "Failed to register submodule '$path'"
+msgstr ""
+
+#: git-submodule.sh:312
+#, sh-format
+msgid "Entering '$prefix$path'"
+msgstr ""
+
+#: git-submodule.sh:324
+#, sh-format
+msgid "Stopping at '$path'; script returned non-zero status."
+msgstr ""
+
+#: git-submodule.sh:367
+#, sh-format
+msgid "No url found for submodule path '$path' in .gitmodules"
+msgstr ""
+
+#: git-submodule.sh:377
+#, sh-format
+msgid "Failed to register url for submodule path '$path'"
+msgstr ""
+
+#: git-submodule.sh:382
+#, sh-format
+msgid "Failed to register update mode for submodule path '$path'"
+msgstr ""
+
+#: git-submodule.sh:384
+#, sh-format
+msgid "Submodule '$name' ($url) registered for path '$path'"
+msgstr ""
+
+#: git-submodule.sh:467
+#, sh-format
+msgid ""
+"Submodule path '$path' not initialized\n"
+"Maybe you want to use 'update --init'?"
+msgstr ""
+
+#: git-submodule.sh:480
+#, sh-format
+msgid "Unable to find current revision in submodule path '$path'"
+msgstr ""
+
+#: git-submodule.sh:504
+#, sh-format
+msgid "Unable to fetch in submodule path '$path'"
+msgstr ""
+
+#: git-submodule.sh:517
+#, sh-format
+msgid "Unable to rebase '$sha1' in submodule path '$path'"
+msgstr ""
+
+#: git-submodule.sh:518
+#, sh-format
+msgid "Submodule path '$path': rebased into '$sha1'"
+msgstr ""
+
+#: git-submodule.sh:522
+#, sh-format
+msgid "Unable to merge '$sha1' in submodule path '$path'"
+msgstr ""
+
+#: git-submodule.sh:523
+#, sh-format
+msgid "Submodule path '$path': merged in '$sha1'"
+msgstr ""
+
+#: git-submodule.sh:527
+#, sh-format
+msgid "Unable to checkout '$sha1' in submodule path '$path'"
+msgstr ""
+
+#: git-submodule.sh:528
+#, sh-format
+msgid "Submodule path '$path': checked out '$sha1'"
+msgstr ""
+
+#: git-submodule.sh:539 git-submodule.sh:841
+#, sh-format
+msgid "Failed to recurse into submodule path '$path'"
+msgstr ""
+
+#: git-submodule.sh:623
+msgid "--"
+msgstr ""
+
+#. unexpected type
+#: git-submodule.sh:664
+#, sh-format
+msgid "unexpected mode $mod_dst"
+msgstr ""
+
+#: git-submodule.sh:684
+#, sh-format
+msgid " Warn: $name doesn't contain commit $sha1_src"
+msgstr ""
+
+#: git-submodule.sh:687
+#, sh-format
+msgid " Warn: $name doesn't contain commit $sha1_dst"
+msgstr ""
+
+#: git-submodule.sh:690
+#, sh-format
+msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
+msgstr ""
+
+#: git-submodule.sh:715
+msgid "blob"
+msgstr ""
+
+#: git-submodule.sh:716
+msgid "submodule"
+msgstr ""
+
+#: git-submodule.sh:753
+msgid "# Submodules changed but not updated:"
+msgstr ""
+
+#: git-submodule.sh:755
+msgid "# Submodule changes to be committed:"
+msgstr ""
+
+#: git-submodule.sh:885
+#, sh-format
+msgid "Synchronizing submodule url for '$name'"
+msgstr ""
+
+#~ msgid "See 'git help COMMAND' for more information on a specific command."
+#~ msgstr "Sjá 'git help SKIPUN' til að sjá hjálp fyrir tiltekna skipun."
+
+#~ msgid "TEST: A C test string"
+#~ msgstr "TILRAUN: C tilraunastrengur"
+
+#~ msgid "TEST: A C test string %s"
+#~ msgstr "TILRAUN: C tilraunastrengur %s"
+
+#~ msgid "TEST: A Shell test string"
+#~ msgstr "TILRAUN: Skeljartilraunastrengur"
+
+#~ msgid "TEST: A Shell test $variable"
+#~ msgstr "TILRAUN: Skeljartilraunastrengur með breytunni $variable"
+
+#~ msgid "TEST: A Perl test string"
+#~ msgstr "TILRAUN: Perl tilraunastrengur"
+
+#~ msgid "TEST: A Perl test variable %s"
+#~ msgstr "TILRAUN: Perl tilraunastrengur með breytunni %s"
--
1.7.6.3
^ permalink raw reply related
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