dology
(but doesn't require it).
A pretty good discussion of these ideas can be found at
https://stackoverflow.com/questions/7175869/managing-hotfixes-when-develop-branch-is-very-different-from-master
Regards,
Andrew Ardill
ll scripts to a built-in. I'm sure other people are too, and I'll
bet the ones who have been there before will have feedback for you as
well.
I'd find it interesting even if it was a 5-line bullet list of what's
going through your mind with respect to the project! Looking forward
to following along.
Regards,
Andrew Ardill
ight work for stash pop conflicts.
This one[1] shows how to create hooks that catch any conflicts that
are being committed, and would also probably work with stash
conflicts.
Teaching the tool to handle stash conflicts, or making any of the
above changes to the base distribution of git would be signific
ipedia.org/wiki/Yes_(Unix)
I agree it's a little weird if you have no idea what it's doing, but
it is very useful and very old, used by many many different scripts
etc, and so unlikely to change.
Regards,
Andrew Ardill
branch names,
specifically because it is a special character in shells.
Regards,
Andrew Ardill
Hi Anatoli,
On 21 August 2017 at 07:57, Anatolii Borodin <anatoly.boro...@gmail.com> wrote:
> On Sun, Aug 20, 2017 at 2:40 PM, Andrew Ardill <andrew.ard...@gmail.com>
> wrote:
>> Maybe I am missing something obvious, but if that's the case then
>> can't we just do
ing commits
> with bogus ident information, we changed it in 2012.
Maybe I am missing something obvious, but if that's the case then
can't we just do the identity check when trying to make new commits,
in which case you should be able to pull without setting your
identity?
Regards,
Andrew Ardill
,
Andrew Ardill
On 16 August 2017 at 16:47, Kim Birkelund <k...@birkelund.me> wrote:
> Apologies. I should obviously have mentioned which OSes the machines I
> tested on ran.
>
> One Windows 10 (fully updated) and one Windows Server 2016 (also
> updated). I've also seen it in a r
ian Couder (cc'd) organised the last few editions, and might
have an idea about how it could be localised if that was something
your community wanted to support.
Regards,
Andrew Ardill
[0] https://git.github.io/rev_news/
On 25 July 2017 at 04:11, Jeff King <p...@peff.net> wrote:
> On Mon, Jul 24, 2017 at 02:58:38PM +1000, Andrew Ardill wrote:
>
>> On 24 July 2017 at 13:45, Farshid Zavareh <fhzava...@gmail.com> wrote:
>> > I'll probably test this myself, but would modifying an
8s
$ time git checkout master # 38.267s
$ git gc
$ du -h --max-depth=1
1.3G./.git
3.4G.
$ time git checkout HEAD^ # 34.743s
$ time git checkout HEAD^ # 41.226s
Regards,
Andrew Ardill
be replicated later on, but I don't want to add 4GB
of data to the repo every single time the dataset gets updated (also
every quarter). Storing that in LFS would be a good solution then.
Regards,
Andrew Ardill
ing on how you do the revert.
Does that page describe what you're trying to do?
Regards,
Andrew Ardill
On 8 July 2017 at 07:07, Martin Langhoff <martin.langh...@gmail.com> wrote:
> Hi git-folk!
>
> long time no see! I'm trying to do one of those "actually, please
> d
o maybe I missed what
has happened to it.
Really enjoying your updates, by the way, they are very clear and show
what looks like great progress!
Regards,
Andrew Ardill
There was a patch suggested, and it worked quite well, but nothing
further has been done to my knowledge.
[0] http://public-inbox.org/git/7vvc3d1o01@alter.siamese.dyndns.org/
Regards,
Andrew Ardill
v -f to rename files on
case insensitive file systems.
Details at
https://stackoverflow.com/questions/17683458/how-do-i-commit-case-sensitive-only-filename-changes-in-git
Regards,
Andrew Ardill
Hi,
Jakub Narębski <jna...@gmail.com> wrote:
> Andrew Ardill pisze:
> > Jakub Narębski <jna...@gmail.com> wrote:
> >> 25. What [channel(s)] do you use to request/get help about Git [(if any)]
> >
> > It may also be useful to ask how people hear news about
ir distro and update at the same time as they update
other packages, but it would be interesting to know if people, for
example, only upgrade their managed environments every year/6 months
or something to avoid introducing changes to their users.
Regards,
Andrew Ardill
--
To unsubscribe from this l
on this seems unlikely that that is all that is going on is
due to you seeing the behaviour on a completely fresh OS and git
install.
If you are able to give more details in the bug report about how to
reproduce the behaviour that will help a lot too.
Regards,
Andrew Ardill
--
To unsubscribe fro
g that would break scripts etc, but if so you could
make it implied only if we detect a terminal or something like is done
in other places.
Regards,
Andrew Ardill
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More m
-ff
however I suspect that such a change may well cause more problems then
it fixes.
What I wonder is, in what situation is the current behaviour is desirable?
While I agree that the option works as designed, I think its behaviour
is more surprising to the end user then it should be.
Regards,
Andrew Ard
rst? What if I reorder the
commits?
My practical knowledge of notes is severely lacking so excuse me if I
missed anything obvious.
Regards,
Andrew Ardill
(sorry for the double post Junio, gmail ate my plain text encoding at
some point...)
--
To unsubscribe from this list: send th
o do as many microprojects as possible, leaving few
for other people.
Regards,
Andrew Ardill
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
er
changeset.author.name or changeset.author.emailAddress if you want to
filter on whose commits are included, or changeset.parents if you only
want to include merge commits.
There are plenty of options for more complex filtering, but that might
be able to help
Regards,
Andrew Ardill
--
To unsubscr
/master/Documentation/RelNotes/2.5.0.txt)
for all the nitty gritty details.
--8--
I'll copy this over to a pull request so you have it there if you
think it's useful.
Again, thanks for the edition, love reading these each month!
Regards,
Andrew Ardill
--
To unsubscribe from this list: send the line
,
Andrew Ardill
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
together would make the intended usage
more obvious to both new and old users, though each change could stand
on its own as well.
Regards,
Andrew Ardill
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http
,
Andrew Ardill
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
one,
https://github.com/git would be a good place to put this.
Regards,
Andrew Ardill
(I'm always concerned about making useless contributions to
conversations like this, but I think having a specific location for
resources like the logo will be very valuable).
--
To unsubscribe from this list
the relationship direction,
or adding new adjective pairs).
Sorry if that is all confusing to read, or if I'm repeating things
that have been said before :)
Regards,
Andrew Ardill
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More
,
Andrew Ardill
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
tracking
solution; the solution is not obvious, and the current (very
customised) workflow is not supported directly by any tool.
Regards,
Andrew Ardill
[1] https://git-scm.atlassian.net
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord
Have you tried backslash escaping the backslash? double escaping?
I don't know how many are required, but I would try first \S, then
\\S, then S, etc
Regards,
Andrew Ardill
On 30 October 2013 12:34, Eugene Sajine eugu...@gmail.com wrote:
Hi,
I need some advice about creating the git
with commit numbers
and looses tags.. Is there any other way to have it done ?
It sounds like a shallow checkout might be appropriate for you, try
looking that up.
Regards,
Andrew Ardill
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord
,
Andrew Ardill
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
of the next release, to
encourage people who test that branch to try them out. (Just thinking
out loud.)
I guess that's my real question; we haven't had a major version
release for a long time and I don't know what the cycle will look
like. Will be interesting to see how it progresses.
Regards,
Andrew
behaviour.
They are only displayed if
they pass a minimum threshold of participation.
Out of interest, how is the threshold determined and is it configurable?
Regards,
Andrew Ardill
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
On Mon, Aug 12, 2013 at 11:01:03PM +1000, Andrew Ardill wrote:
On 12 August 2013 22:39, Jeff King p...@peff.net wrote:
We could do something like the patch below, which allows:
$ git config --global include./magic/.path .gitconfig-magic
to read ~/.gitconfig-magic only when we
the subsection chaining is the nicest
overall, though your original repo: proposal seems to be the easiest
to implement.
Regards,
Andrew Ardill
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http
folder to my other
git directories, and as such it would be extremely convenient if every
repository under that folder defaulted to the same profile. That may
be asking for too much though!
Regards,
Andrew Ardill
--
To unsubscribe from this list: send the line unsubscribe git in
the body
will be a bit
clearer.
Again thanks, this will scratch an itch I didn't even realise I had.
Regards,
Andrew Ardill
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
be too much pain going that way.
Regards,
Andrew Ardill
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
workflows have done a lot to
promote a set of usage patterns that keep this metadata around, I just
wonder if we can do more to assist users in what seems to be a
relatively common request.
Regards,
Andrew Ardill
--
To unsubscribe from this list: send the line unsubscribe git in
the body
has been set.
Your proposed change would break all those. For that reason, it might
be nicer to introduce a flag that returns the config if it is set or
the default otherwise. Something like git config --value perhaps.
Regards,
Andrew Ardill
--
To unsubscribe from this list: send the line
change,
but a flag to change the behaviour might be nice. Then again, there
may be away to do what you want already :-)
Regards,
Andrew Ardill
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http
documentation for -p). When in patch mode, git add will
propose deletions get added to the index as well, not just additions
and modifications.
Regards,
Andrew Ardill
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo
that
behaviour off. So, when we talk about git add -u and git add -A, we
should also mention git add -p.
Regards,
Andrew Ardill
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org
) and think the
previous discussions and patch look reasonable. Does it need testing?
Further input??
Regards,
Andrew Ardill
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo
not to do
git add -u or git commit -a.
Many people use git add -p by default, so I would not be surprised
about people not using -u or -a.
Regards,
Andrew Ardill
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo
??
Regards,
Andrew Ardill
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
.
Regards,
Andrew Ardill
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
prompting the user would be
annoying when using this command?
Regards,
Andrew Ardill
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
containing the exact state of all files.
Hopefully that clears it up for you?
Regards,
Andrew Ardill
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Regards,
Andrew Ardill
On 17 December 2012 19:20, Johannes Sixt j.s...@viscovery.net wrote:
Am 12/17/2012 8:21, schrieb Junio C Hamano:
Chris Rorvick ch...@rorvick.com writes:
'git checkout' [branch]::
Is branch really optional in this form?
BTW, what does plain 'git checkout' do? Just
On 18 December 2012 08:59, Junio C Hamano gits...@pobox.com wrote:
Andrew Ardill andrew.ard...@gmail.com writes:
Even if the primary purpose of git checkout branch is to check
out the branch so that further work is done on that branch, I don't
believe that means it has to be stated first
On 18 December 2012 03:01, Toralf Förster toralf.foers...@gmx.de wrote:
On 12/17/2012 12:38 PM, Andrew Ardill wrote:
On 17 December 2012 21:23, Toralf Förster toralf.foers...@gmx.de wrote:
Hello,
I'm faced with this situation :
http://lists.ssl.berkeley.edu/mailman/private/boinc_alpha/2012
, detach HEAD at it
+ (see DETACHED HEAD section), and update the index and the
+ files in the working tree.
Regards,
Andrew Ardill
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http
changes we make might be
'lost' (that is, not have an easy to find branch name).
Regards,
Andrew Ardill
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
to be
in sync with the remote branch, but you haven't yet copied that remote
reference to a local branch that you can update with your changes.
Hope that clears it up.
Regards,
Andrew Ardill
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
be useful to make this behaviour more clear.
Regards,
Andrew Ardill
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
On 17 December 2012 18:21, Junio C Hamano gits...@pobox.com wrote:
does it format well (I didn't check)?
It applied cleanly for me on latest master, and the output looked
consistent with existing documentation.
Regards,
Andrew Ardill
--
To unsubscribe from this list: send the line unsubscribe
it in general (maybe if you ignored everything belonging to the other
repository?) In any case, this solution could quickly become messy,
but if carefully controlled might solve your problem. Then again,
maybe you can achieve what you want using more 'traditional' git
workflows.
Regards,
Andrew
other
gmail traffic has been fine over the period. Maybe somebody else knows
what happened :)
Regards,
Andrew Ardill
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo
in gitk at the same
time. You probably have some more specific needs beyond simply showing
the different branches. Maybe you can be more specific?
Regards,
Andrew Ardill
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More
-lane, as per current
behaviour, but to have separate branch heads in different swim-lanes.
This would be a nice feature, and is similar to the behaviour in, for
example, Atlassian's Fisheye repository viewer and the GitHub network
view.
Regards,
Andrew Ardill
--
To unsubscribe from this list: send
, it will put any loose objects from the alternate tree
too, so you'll have a fully packed archive, but it won't duplicate objects
that are already packed in the alternate tree).
[1]
https://git.wiki.kernel.org/index.php/GitFaq#How_to_share_objects_between_existing_repositories.3F
Regards,
Andrew Ardill
always recover by replacing
the alternates file and starting over).
Regards,
Andrew Ardill
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
)
--no-hardlinks can be used.
So hardlinks should be used where possible, and if they are not try
upgrading Git.
I think that covers all the use cases you have?
Regards,
Andrew Ardill
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord
the reference manual, but perhaps there is something else going
on here.
On another (related) note, the wayback machine has some very
interesting entries for the scm-git.org domain [1] and it seems the
/doc directory is not indexed at all. Is this on purpose?
Regards,
Andrew Ardill
[1] http
setting up a project-default merge configuration for
contributors that defaulted to --humble? Not sure if that is useful or
not, but it at least seems safer than trying to default to doing reset
--hard after every merge.
Regards,
Andrew Ardill
--
To unsubscribe from this list: send the line
before you merge it, but a tool to warn that someone else is modifying
the same file would have its uses.
Regards,
Andrew Ardill
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org
On 5 October 2012 12:20, Sitaram Chamarty sitar...@gmail.com wrote:
On Fri, Oct 5, 2012 at 7:05 AM, demerphq demer...@gmail.com wrote:
On 5 October 2012 03:00, Andrew Ardill andrew.ard...@gmail.com wrote:
On 5 October 2012 07:20, Marco Craveiro marco.crave...@gmail.com wrote:
...
Similar
On 14 September 2012 12:29, Junio C Hamano gits...@pobox.com wrote:
Andrew Ardill andrew.ard...@gmail.com writes:
On 14 September 2012 04:06, Junio C Hamano gits...@pobox.com wrote:
Andrew Ardill andrew.ard...@gmail.com writes:
short-branch-description
long-branch-description
notes
am not interested in without having to scan the list of commits and
other details.
Regards,
Andrew Ardill
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
74 matches
Mail list logo
