On Wed, Dec 12, 2012 at 02:03:56AM -0500, Patrick Donnelly wrote:
On Wed, Dec 12, 2012 at 1:32 AM, Jeff King p...@peff.net wrote:
It would take a lot of effort to expose git-core's internals in a clean
way; you'd probably be better off starting from scratch and rewriting
large parts in a
On Tue, 11 Dec 2012 10:15:23 -0800
Junio C Hamano gits...@pobox.com wrote:
Yann Dirson dir...@bertin.fr writes:
There seems to be some bad interactions between git-push and grafts.
The problem seems to occur when a commit that exists in the remote
repo is subject to a graft in the local
Hi Junio
This removes most of the ambiguities :-)
Ack from me!
I still have some minor nits, but I'll leave that for another time when I'm
less busy.
BTW, I haven't tried this yet, but if you pass 2 arguments to __git_ps1 when
called from command-substition mode, I suppose it will think it's
On Wed, 12 Dec 2012 09:44:32 +0100 Yann Dirson dir...@bertin.fr wrote:
In fact, I even looked for a way to specify an alternate (or supplementary)
grafts file for this drafting work, so only well-controlled git invocations
would see them, whereas the others would just ignore them, and could not
I noticed recently that the GitHub contributions page for git.git did
not seem very accurate. The problem is that while it uses shortlog, it
does not respect .mailmap, because we do not have a working tree from
which to read the .mailmap.
This series adds a config option analogous to
The read_single_mailmap function opens a mailmap file and
parses each line. In preparation for having non-file
mailmaps, let's pull out the line-parsing logic into its own
function (read_mailmap_line), and rename the file-parsing
function to match (read_mailmap_file).
Signed-off-by: Jeff King
In a bare repository, there isn't a simple way to respect an
in-tree mailmap without extracting it to a temporary file.
This patch provides a config variable, similar to
mailmap.file, which reads the mailmap from a blob in the
repository.
Signed-off-by: Jeff King p...@peff.net
---
The
On Wed, Dec 12, 2012 at 06:04:04AM -0500, Jeff King wrote:
The error-return convention from read_mailmap is really wonky, but I
didn't change it here. It will return 1 for error, and will do so only
if no mailmap sources could be read (including if they simply don't
exist). But it's perfectly
I noticed a few obvious problems in the output of git shortlog -nse on
git.git. So I wrote an analysis script to find more, and of course there
were lots.
This series tries to clean up the low-hanging fruit. The first two
commits fix multiple names matching a single email. Hopefully not too
This patch updates git's .mailmap in cases where multiple
names are matched to a single email. The master name for
each email was chosen by:
1. If the only difference is in the presence or absence
of accented characters, the accented form is chosen
(under the assumption that it is the
Commit adc3192 (Martin Langhoff has a new e-mail address,
2010-10-05) added a mailmap entry, but forgot that both the
old and new email addresses need to appear for one to be
mapped to the other (i.e., we do not key mailmap emails by
name).
Signed-off-by: Jeff King p...@peff.net
---
.mailmap | 2
I never meant anything special by using my @github.com
address; it is merely a mistake that it has sometimes bled
through to patches.
Signed-off-by: Jeff King p...@peff.net
---
.mailmap | 1 +
1 file changed, 1 insertion(+)
diff --git a/.mailmap b/.mailmap
index e370e86..4a27b7f 100644
---
Linus used a lot of different per-machine email addresses in
the early days. This means that git shortlog -nse does not
aggregate his counts, and he is listed well below where he
should be (8th instead of 3rd).
Signed-off-by: Jeff King p...@peff.net
---
Linus,
I recall you considered email ident
This version changes quite a few things:
1. The original parsed the mailmap file itself, and it did
it wrong (it did not understand entries with an extra
email key).
Instead, this version uses git's %aE and %aN
formats to have git perform the mapping, meaning we do
not
On Tue, Dec 11, 2012 at 11:21 PM, Antoine Pelisse apeli...@gmail.com wrote:
Add the --use-mailmap option to log commands. It allows
to display names from mailmap file when displaying logs,
whatever the format used.
The question is which log commands actually ?
Shouldn't we put the option in
Joshua Jensen jjen...@workspacewhiz.com:
Anyway, my preference is to allow scripts to run in-process within
Git, because it is far, far faster on Windows. I imagine it is
faster than forking processes on non-Windows machines, too, but I
have no statistics to back that up.
Python, Perl, or
On Mon, Dec 10, 2012 at 07:04:40PM +0700, Nguyen Thai Ngoc Duy wrote:
With or without --no-merges, the big picture you can get out of
git shortlog -s -n --since=1.year does not change very much, but
the headline numbers give a wrong impression.
These numbers are approximate anyway.
Jeff King p...@peff.net:
I think there are really two separate use cases to consider:
1. Providing snippets of script to Git to get Turing-complete behavior
for existing Git features. For example, selecting commits during a
traversal (e.g., a better log --grep), formatting output
On Wed, Dec 12, 2012 at 07:26:25AM -0500, Eric S. Raymond wrote:
Jeff King p...@peff.net:
I think there are really two separate use cases to consider:
1. Providing snippets of script to Git to get Turing-complete behavior
for existing Git features. For example, selecting commits
We have been writing -1 as invalid since day 1. On that same day we
accept all negative entry counts as invalid. So in theory all C Git
versions out there would be happy to accept any negative numbers. JGit
seems to do exactly the same.
Correct the document to reflect the fact that -1 is not the
Or it might be better to make those two strbufs output-only
parameter, e.g.
map_user(struct string_list *mailmap,
const char *name, size_t namelen,
const char *mail, size_t maillen,
struct strbuf *name_out, struct strbuf *mail_out);
Here I. Come me.detected at gmail.com writes:
--8---
$ git svn clone https://host/svn/myrepo
Initialized empty Git repository in /tmp/myrepo/.git/
Bad URL passed to RA layer: Unrecognized URL scheme for
'https://host/svn/myrepo' at
Robin Rosenberg venit, vidit, dixit 06.12.2012 02:23:
- Ursprungligt meddelande -
Robin Rosenberg robin.rosenb...@dewire.com writes:
If core.symlinks is set to copy then symbolic links in a git
repository
will be checked out as copies of the file it points to.
That all sounds
Karl Brand venit, vidit, dixit 11.12.2012 13:33:
Esteemed Git users,
What i do:
1. Create a script.r using Emacs/ESS.
2. Make some modifications to script.r with the nice diff gui, Meld
3. Commit these modifications using git commit -am my message
4. Reopen script.r in Emacs/ESS to
Jens Lehmann venit, vidit, dixit 04.12.2012 22:48:
With git submodule init the user is able to tell git he cares about one
or more submodules and wants to have it populated on the next call to git
submodule update. But currently there is no easy way he could tell git he
does not care about a
On Tue, Dec 11, 2012 at 09:42:48PM -0800, Junio C Hamano wrote:
What branch did you base this series on?
Every version of this series has been based on v1.8.0.
The preimage of git-submodule.sh in [2/3] does not seem to match
anything I have (I could wiggle the patch, but in general I would
On 12/12/12 15:57, Michael J Gruber wrote:
Karl Brand venit, vidit, dixit 11.12.2012 13:33:
Esteemed Git users,
What i do:
1. Create a script.r using Emacs/ESS.
2. Make some modifications to script.r with the nice diff gui, Meld
3. Commit these modifications using git commit -am my message
On 12-12-11 05:30 PM, Junio C Hamano wrote:
Marc Branchaud marcn...@xiplink.com writes:
My point is that the initial checkout into an empty working directory should
create all files with the same timestamp.
Or, to be a bit more precise, whenever git-checkout *creates* files in the
work
Karl Brand venit, vidit, dixit 12.12.2012 16:34:
On 12/12/12 15:57, Michael J Gruber wrote:
Karl Brand venit, vidit, dixit 11.12.2012 13:33:
Esteemed Git users,
What i do:
1. Create a script.r using Emacs/ESS.
2. Make some modifications to script.r with the nice diff gui, Meld
3.
- Ursprungligt meddelande -
Robin Rosenberg venit, vidit, dixit 06.12.2012 02:23:
- Ursprungligt meddelande -
Robin Rosenberg robin.rosenb...@dewire.com writes:
If core.symlinks is set to copy then symbolic links in a git
repository
will be checked out as
The Documentation/git.txt file, in the GIT_DIR environment variable
section, did not mentioned that this value can also be set using the
--git-dir command line option.
---
Documentation/git.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/Documentation/git.txt b/Documentation/git.txt
index
On Tue, Dec 11, 2012 at 5:32 PM, Junio C Hamano gits...@pobox.com wrote:
In a repository cloned from somewhere else, you typically have a
[...]
* This time with minimal tests and an updated log message.
Sorry I haven't been reading the list much lately, so I don't know the
context which
On 11.12.12 23:30, Junio C Hamano wrote:
Marc Branchaud marcn...@xiplink.com writes:
My point is that the initial checkout into an empty working directory should
create all files with the same timestamp.
Or, to be a bit more precise, whenever git-checkout *creates* files in the
work
Am 12.12.2012 16:08, schrieb Michael J Gruber:
Jens Lehmann venit, vidit, dixit 04.12.2012 22:48:
With git submodule init the user is able to tell git he cares about one
or more submodules and wants to have it populated on the next call to git
submodule update. But currently there is no easy
-Original Message-
From: Torsten Bögershausen
Sent: Wednesday, December 12, 2012 12:19 PM
On 11.12.12 23:30, Junio C Hamano wrote:
Marc Branchaud marcn...@xiplink.com writes:
My point is that the initial checkout into an empty working
directory should
create all files
Unlike --pretty-format, --graph doesn’t output colors when the git log output
is redirected.
Tested on Ubuntu 12.04 and msys on Windows 8.
Is there a setting somewhere in config to change this?
Thanks,
Michal
--
To unsubscribe from this list: send the line unsubscribe git in
the body
Thanks for looking after this.
On Tue, Dec 11, 2012 at 1:58 PM, W. Trevor King wk...@tremily.us wrote:
From: W. Trevor King wk...@tremily.us
The current `update` command incorporates the superproject's gitlinked
SHA-1 ($sha1) into the submodule HEAD ($subsha1). Depending on the
options you
Jeff King p...@peff.net writes:
I think there are really two separate use cases to consider:
1. Providing snippets of script to Git to get Turing-complete behavior
for existing Git features. For example, selecting commits during a
traversal (e.g., a better log --grep), formatting
Simon Oosthoek s.oosth...@xs4all.nl writes:
This removes most of the ambiguities :-)
Ack from me!
OK, as this is a low-impact finishing touch for a new feature, I'll
fast-track this to 'master' before the final release.
Thanks.
--
To unsubscribe from this list: send the line unsubscribe git
Jeff King p...@peff.net writes:
I noticed recently that the GitHub contributions page for git.git did
not seem very accurate. The problem is that while it uses shortlog, it
does not respect .mailmap, because we do not have a working tree from
which to read the .mailmap.
This series adds a
Antoine Pelisse apeli...@gmail.com writes:
On Tue, Dec 11, 2012 at 11:21 PM, Antoine Pelisse apeli...@gmail.com wrote:
Add the --use-mailmap option to log commands. It allows
to display names from mailmap file when displaying logs,
whatever the format used.
The question is which log
On Wed, Dec 12, 2012 at 09:54:23AM -0800, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
I noticed recently that the GitHub contributions page for git.git did
not seem very accurate. The problem is that while it uses shortlog, it
does not respect .mailmap, because we do not have a
Jeff King p...@peff.net writes:
I find the ohloh one a little more informative than the GitHub graph. I
couldn't find any others (Google Code does not seem to have one,
kernel.org and other gitweb sites do not, and I can't think of anywhere
else that hosts a mirror).
Then let's do this.
--
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
We have been writing -1 as invalid since day 1. On that same day we
accept all negative entry counts as invalid. So in theory all C Git
versions out there would be happy to accept any negative numbers. JGit
seems to do exactly the same.
I am of
W. Trevor King wk...@tremily.us writes:
On Tue, Dec 11, 2012 at 09:42:48PM -0800, Junio C Hamano wrote:
What branch did you base this series on?
Every version of this series has been based on v1.8.0.
Thanks.
There were quite a few changes to git-submodule.sh since then to
'master' and I had
Kevin i...@ikke.info writes:
Regularly I notice that the diffs that are provided (through diff, or
add -p) tend to disconnect changes that belong to each other and
report lines being changed that are not changed.
An example for this is:
/**
+ * Default parent
+ *
+ *
On 12-12-12 01:29 PM, Junio C Hamano wrote:
Here the end of the pre-context matches the end of the added lines,
but it will produce worse result if you blindly apply the shift the
hunk up trick:
Yeah. I would not think a blind shift would be appropriate. But I
wonder if diff can take
Marc Branchaud marcn...@xiplink.com writes:
It's FreeBSD 7.2, which I know is an obsolete version but I'm not able to
upgrade the machine. I believe FreeBSD's sh is, or is derived from, dash.
Dash has been the default '/bin/sh' for Ubuntu for quite a long time
now[1] in spite of repeated
On Tue, Dec 11, 2012 at 11:46 AM, Junio C Hamano gits...@pobox.com wrote:
This is a companion to an ancient thread
http://thread.gmane.org/gmane.comp.version-control.git/145311/focus=145337
in which an error was dealt with while pushing into a mirror
repository that has a symbolic
Yeah, I didn't mention it, but I didn't think it was doing this wrong
in a systematic way. I only wondered if there was some kind of
heuristic that could improve the cases where it goes wrong, without
affecting the cases where it would do it right.
I know this is not an easy problem, lest it
Jens Lehmann jens.lehm...@web.de writes:
Especially as I suspect the number of submodule users having
customized those in .git/config is not that high ...
I thought the point of deinit was to say I am not interested in
having a checkout of these submodules in my working tree anymore.
The user
Manlio Perillo manlio.peri...@gmail.com writes:
The Documentation/git.txt file, in the GIT_DIR environment variable
section, did not mentioned that this value can also be set using the
--git-dir command line option.
---
s/mentioned/mention/; Also it may help to say
Unlike other
Shawn Pearce spea...@spearce.org writes:
Work it around by noticing a wildcard match that attempts to update
a local symbolic ref and ignoring it.
At what point should we just support symrefs on the protocol? :-(
I think it is entirely an orthogonal matter. When we learn that the
other side
Phil Hord phil.h...@gmail.com writes:
Marc Branchaud marcn...@xiplink.com writes:
It's FreeBSD 7.2, which I know is an obsolete version but I'm not able to
upgrade the machine. I believe FreeBSD's sh is, or is derived from, dash.
Dash has been the default '/bin/sh' for Ubuntu for quite a
Phil Hord phil.h...@gmail.com writes:
+ if test -n $remote
+ then
+ if test -z $nofetch
+ then
+ # Fetch remote before determining tracking
$sha1
+
Yann Dirson dir...@bertin.fr writes:
In this respect, they seem to be
lacking a few features, when compared to replace refs, but they have
different
uses, ...
Not reallyl; grafts were old hack whose use is still supported with
its original limitations; replace is meant to replace all
Robin Rosenberg robin.rosenb...@dewire.com writes:
I want the copy on checkout. The intent is to change things and
then commit.
That largely depends on what purpose each symlink is used for in the
project.
Suppose you have a symlink A and another symlink X in the project,
where A points at
On 12/12/12 18:50, Junio C Hamano wrote:
Simon Oosthoek s.oosth...@xs4all.nl writes:
This removes most of the ambiguities :-)
Ack from me!
OK, as this is a low-impact finishing touch for a new feature, I'll
fast-track this to 'master' before the final release.
Ok, wonderful!
BTW, I
Junio C Hamano gits...@pobox.com writes:
Kevin i...@ikke.info writes:
Regularly I notice that the diffs that are provided (through diff, or
add -p) tend to disconnect changes that belong to each other and
report lines being changed that are not changed.
An example for this is:
/**
So I think with s/Regularly/About half the time/, your observation
above is correct.
I think the reason you perceived this as Regularly is that you do
not notice nor appreciate it when things go right (half the time),
but you tend to notice and remember only when a wrong side happened
to
Morten Welinder mwelin...@gmail.com writes:
Is there a reason why picking among the choices in a sliding window
must be contents neutral?
Sorry, you might be getting at something interesting but I do not
understand the question. I have no idea what you mean by contents
neutral.
Picking
On Tue, Nov 27, 2012 at 5:03 PM, Max Horn m...@quendi.de wrote:
index 5ce4cda..9a7e583 100644
--- a/Documentation/git-remote-helpers.txt
+++ b/Documentation/git-remote-helpers.txt
@@ -35,6 +35,37 @@ transport protocols, such as 'git-remote-http',
'git-remote-https',
'git-remote-ftp' and
On Fri, Dec 7, 2012 at 1:09 PM, Junio C Hamano gits...@pobox.com wrote:
Max Horn m...@quendi.de writes:
Various remote helper capabilities and commands were not
documented, in particular 'export', or documented in a misleading
way (e.g. 'for-push' was listed as a ref attribute understood by
Am 12.12.2012 20:32, schrieb Junio C Hamano:
Jens Lehmann jens.lehm...@web.de writes:
Especially as I suspect the number of submodule users having
customized those in .git/config is not that high ...
I thought the point of deinit was to say I am not interested in
having a checkout of
On Fri, Dec 7, 2012 at 11:21 AM, Junio C Hamano gits...@pobox.com wrote:
Steffen Jaeckel steffen.jaec...@stzedn.de writes:
Signed-off-by: Steffen Jaeckel steffen.jaec...@stzedn.de
---
contrib/completion/git-completion.bash | 9 +
1 file changed, 9 insertions(+)
diff --git
On Thu, Dec 6, 2012 at 12:01 PM, Junio C Hamano gits...@pobox.com wrote:
Adam Tkac at...@redhat.com writes:
On Thu, Nov 29, 2012 at 09:33:53AM -0800, Junio C Hamano wrote:
...
IOW, something along this line?
This won't work, unfortunately, because shopt settings aren't inherited by
Jens Lehmann jens.lehm...@web.de writes:
So unless people agree that deinit should also remove the work
tree I'll prepare some patches teaching all git commands to
consistently ignore deinitialized submodules. Opinions?
While I agree that consistency is good, deinit that does not
remove the
Andrew Ardill andrew.ard...@gmail.com writes:
On 13 December 2012 04:49, Junio C Hamano gits...@pobox.com wrote:
bisect with used-to-be, now-is vs
good, bad issue unsettled
Would you want to see this issue resolved in-script before a porting
attempt was started?
Honestly, I do not care too
On Wed, Dec 12, 2012 at 10:19:32AM -0800, Junio C Hamano wrote:
In any case, I ended up applying them by editing the patches, and I
should have a good copy in 'pu'. Please double check the result.
Your 'pu' branch looks good to me. Most of the differences with my
initial patch are due to
On 12.12.2012, at 23:14, Felipe Contreras wrote:
On Tue, Nov 27, 2012 at 5:03 PM, Max Horn m...@quendi.de wrote:
index 5ce4cda..9a7e583 100644
--- a/Documentation/git-remote-helpers.txt
+++ b/Documentation/git-remote-helpers.txt
@@ -35,6 +35,37 @@ transport protocols, such as
Hi;
When compiling git-1.8.0.2 on a moderately old OpenIndiana machine, I had
to install a few things (m4, autoconf, coreutils, xz, python).
Even though I started the configuration fresh (make distclean; configure),
the makefile still wanted to use /usr/bin/python (instead of
On Wed, Dec 12, 2012 at 12:43:23PM -0500, Phil Hord wrote:
On Tue, Dec 11, 2012 at 1:58 PM, W. Trevor King wk...@tremily.us wrote:
diff --git a/Documentation/git-submodule.txt
b/Documentation/git-submodule.txt
…
+--remote::
[snip some --remote documentation]
+In order to ensure a
On 13.12.2012, at 00:00, Felipe Contreras wrote:
[...]
I find all this text a bit confusing. First argument, second argument,
etc. Personally, I would describe everything in the terms of alias
(1st arg), and URL (2nd arg).
Yeah, I also thought about that, but as above, deliberately did
P Fudd pf...@mailinator.com writes:
When compiling git-1.8.0.2 on a moderately old OpenIndiana machine, I had
to install a few things (m4, autoconf, coreutils, xz, python).
Even though I started the configuration fresh (make distclean; configure),
the makefile still wanted to use
On Wed, Dec 12, 2012 at 02:34:47PM -0800, Junio C Hamano wrote:
Jens Lehmann jens.lehm...@web.de writes:
So unless people agree that deinit should also remove the work
tree I'll prepare some patches teaching all git commands to
consistently ignore deinitialized submodules. Opinions?
Max Horn m...@quendi.de writes:
Of course I can also re-roll, if that is necessary/preferred.
No, you can't. The topic has been cooking in 'next' for some days
now already.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
On Wed, Dec 12, 2012 at 2:44 PM, Junio C Hamano gits...@pobox.com wrote:
Phil Hord phil.h...@gmail.com writes:
[2] https://bugs.launchpad.net/ubuntu/+source/dash/+bug/141481
None of the ones listed seems to me a bug. Rather, I see it as a
sign that the reporter does not know POSIX shell well
On 13.12.2012, at 00:13, Junio C Hamano wrote:
Max Horn m...@quendi.de writes:
Of course I can also re-roll, if that is necessary/preferred.
No, you can't. The topic has been cooking in 'next' for some days
now already.
Ah, right, I somehow missed that :-/. Well, I guess it's at most a
I must say it is _quite_ helpfull having the diffs well done (natural
diffs as here named), just because when you want to review a patch on
the fly, this sort of things are annoying.
I just wanted to say my opinion. No idea on how to fix that, nor why
does it happen.
Javier Domingo
2012/12/12
W. Trevor King wk...@tremily.us writes:
Should `deinit` remove the submodule checkout, replace it with the
original gitlink, and clear the .git/config information then? That
would restore the user to the state they'd be in if they were never
interested in the submodule.
AFAIU, restore the
Javier Domingo javier...@gmail.com writes:
I must say it is _quite_ helpfull having the diffs well done (natural
diffs as here named), just because when you want to review a patch on
the fly, this sort of things are annoying.
I do not think anybody is arguing that it would not help the human
Hi,
We have a shared bare git repository on AFS, which our developers
pull from and push to from their local repositories. Some developers
access the bare repository directly over AFS and others use ssh.
Every couple of months, all of the two-character directories under
the objects directory
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
A new maintenance release 1.8.0.2 was tagged with accumulated fixes
we have already been using on the 'master' front for a while. The
tip of
On 12/12/2012 10:53 PM, Junio C Hamano wrote:
Morten Welinder mwelin...@gmail.com writes:
Is there a reason why picking among the choices in a sliding window
must be contents neutral?
Sorry, you might be getting at something interesting but I do not
understand the question. I have no
Jaime Frey jf...@cs.wisc.edu writes:
Stracing git revealed that it successfully recreated the ./objects/fb
and then failed to chmod() it. It failed because it tried to set the
S_ISGID bit, which mere mortals cannot do on AFS. Manually recreating
all of these directories solves the problem.
On Wed, Dec 12, 2012 at 03:35:59PM -0800, Junio C Hamano wrote:
W. Trevor King wk...@tremily.us writes:
Should `deinit` remove the submodule checkout, replace it with the
original gitlink, and clear the .git/config information then? That
would restore the user to the state they'd be in
We have been writing -1 as invalid since day 1. On that same day we
accept all negative entry counts as invalid. So in theory all C Git
versions out there would be happy to accept any negative numbers. JGit
seems to do exactly the same.
Correct the document to reflect the fact that -1 is not the
Intent-to-add entries used to forbid writing trees so it was not a
problem. After commit 3f6d56d (commit: ignore intent-to-add entries
instead of refusing - 2012-02-07), we can generate trees from an index
with i-t-a entries.
However, the commit forgets to invalidate all paths leading to i-t-a
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
How would that work with existing versions? If you write -2 in
cache-tree, the next time 1.8.0 updates cache tree it writes -1 back.
That loses whatever information you attach to -2. A new cache-tree
extension is probably better.
You can
Is there a reason why picking among the choices in a sliding window
must be contents neutral?
Sorry, you might be getting at something interesting but I do not
understand the question. I have no idea what you mean by contents
neutral.
I was merely asking if an algorithm to pick between the
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
Intent-to-add entries used to forbid writing trees so it was not a
problem. After commit 3f6d56d (commit: ignore intent-to-add entries
instead of refusing - 2012-02-07), we can generate trees from an index
with i-t-a entries.
However, the
On Dec 12, 2012, at 20:55, Morten Welinder mwelin...@gmail.com wrote:
I was merely asking if an algorithm to pick between the
2+ choices was allowed to look at the contents of the
lines.
I.e., an algorithm would look at the C comment
example and determine that the choice starting
Hi,
If there are merge conflict files, then changed submodules are not
updated automatically.
Why not submodules?
Files do try to merge / update.
Regards,
ch3cooli
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo
On Wed, Dec 12, 2012 at 5:58 PM, Junio C Hamano gits...@pobox.com wrote:
[Stalled]
* fc/remote-bzr (2012-11-28) 10 commits
- (fixup) test-bzr.sh: fix multi-line string assignment
- remote-bzr: detect local repositories
- remote-bzr: add support for older versions of bzr
- remote-bzr:
Geert Bosch bo...@adacore.com writes:
It would seem that just looking at the line length (stripped) of
the last line, might be sufficient for cost function to minimize.
Here the some would be 3 vs 0. In case of ties, use the last
possibility with minimum cost.
-- 8 --
#ifdef A
some stuff
Friends provided my family a good strong tiffany sale
http://www.tiffanyandcocheap.co.uk/ /strong, I want it all
considerably. I wish to get hold of Tiffany type earrings made available to
your girlfriend, With regards to everyone grant my family certain thoughts?
With regards to I do know, the
Hi,
With git fetch --tags
or remote.origin.tagopt = --tags
git fetch only fetches tags, but not branches.
Current documentation does not mention that no branches are fetched /
pulled when --tags option or remote.origin.tagopt = --tags is
specified.
Regards,
ch3cooli
--
To unsubscribe from this
97 matches
Mail list logo
