On Wed, May 24, 2023 at 5:34 AM Konstantin Khomoutov wrote:
> On Tue, May 23, 2023 at 04:21:30PM -0500, Felipe Contreras wrote:
>
> [...]
> > > For completeness, there's the link to a message which can be served as an
> > > entry point to a different view on these
On Tue, May 23, 2023 at 9:25 AM Konstantin Khomoutov wrote:
>
> On Mon, May 22, 2023 at 05:12:04PM -0600, Felipe Contreras wrote:
>
> > git-fc is a fork of Junio Hamano's git.
> [...]
> > Take for example the "staging area", a term literally
> > everyo
On Tue, May 23, 2023 at 1:21 AM Uwe Brauer wrote:
> >>> "FC" == Felipe Contreras writes:
>
> > git-fc is a fork of Junio Hamano's git.
> > It's targeted to the users of the git tool.
>
> > Completely forking the code opens the doors to many
s of patches that Junio has
ignored over the years.
Why not give it a try?
https://github.com/felipec/git
For Arch Linux users I created a package so you can easily replace
Junio's git:
https://aur.archlinux.org/packages/git-fc
Cheers.
Felipe Contreras (135):
stage: add proper 'stage
| Author: John Ciolfi
> | Date: Mon Apr 10 16:05:31 2023 -0400
> |
> | matlab and org mode example
> |
>
> So commit b7000 belongs to master not to org-mode as I hoped, what did I
> miss?
You changed the "master" branch locally, but you didn't update it on
the re
d branch and I pull it, will it be
> translated into a git branch.
>
>2. What happens if I use the evolve extensions (which hides
> certain commits), would everything pulled, or would the hidden
> be ignored (as say should be).
I don't know.
:refs/heads/branches/master
)
hg -R hg-repo log
changeset: 0:c8ae0e6c7f3e
branch: master
tag: tip
user:Felipe Contreras
date:Tue Apr 18 02:08:35 2023 -0600
summary: one
> > Only if you don't specify the refspec, which is the typical wa
aven't created the local branches, soyou can't do
`git push foo`, if "foo" doesn't exist.
> If I checkout each branch and push them then everything seems find but
> suppose I had 100 branches, I need to checkout each, well
But you are going to need to do tha
t; So I have to clone the repository (from gitlab/github and then use your
> script, while using the mirror option would be possible, it think the
> solution with for-each-ref is what I need)
But you can clone it once, set up all the branches once, push all the
branches ini order once, and forget
xplained:
git for-each-ref --format='git switch %(refname:lstrip=3)' refs/remotes/origin
Or you can push the commit of a remote branch:
git push hg-remote remotes/origin/modernize:modernize
It's not clear what would be the best thing to do here because you
haven't expla
On Sun, Apr 16, 2023 at 6:15 AM Uwe Brauer wrote:
>
> >>> "FC" == Felipe Contreras writes:
>
> > On Sun, Apr 16, 2023 at 3:01 AM Uwe Brauer wrote:
> >>
> >> > git for-each-ref --format='git switch %(refname:lstrip=3)'
> &g
.hg-remote.push refs/heads/*:refs/heads/branches/*
So when you do
git push hg-remote strings
It will automatically do the equivalent of:
git push hg-remote strings:branches/strings
Once you have configured git to automatically push to the right
location, you can push all the branch
s will not track the
remote branches.
At the end of the day I think what you should do is do `git switch`
for every remote branch, which git can help:
git for-each-ref --format='git switch %(refname:lstrip=3)'
refs/remotes/origin
Just remove HEAD and "master", or wh
he upstream master branch, it contains other
commits, and as such it's a true fork.
Maybe `git fork` would have been a better name for `git clone`.
Cheers.
--
Felipe Contreras
--
You received this message because you are subscribed to the Google Groups "Git
for human beings" gro
On Wed, Mar 22, 2023 at 2:37 PM Uwe Brauer wrote:
>
> >>> "FC" == Felipe Contreras writes:
>
> > On Thu, Mar 16, 2023 at 3:26 PM Uwe Brauer wrote:
> >> > I wrote the equivalent of hg-git for the git world: git-remote-hg [1],
> >> > an
porting named hg branches into git branches? Yes that seems ok,
> the other way around is the challenge,
No, I mean from git to hg.
If a ref has a "branches/" prefix, it's considered an hg branch, and
all the commits pushed to that branch get tagged.
--
Felipe Contreras
--
notes [1]
> either.
These are the scripts I see in the Makefile: git-archimport.perl
git-cvsexportcommit.perl git-cvsimport.perl git-cvsserver.perl
git-send-email.perl git-svn.perl
The only one I use is git-send-email, which I've wanted to rewrite in
Ruby for a while, but it's probabl
no option force, so the helper does not
> know that --force was included as an argument.
Did you specify "feature force"?
I think this question is more suited to the development mailing list.
Cheers.
--
Felipe Contreras
--
You received this message because you are subscribed to
On Sat, Mar 11, 2023 at 1:11 PM Uwe Brauer wrote:
>
> > On Thu, Mar 9, 2023 at 8:07 PM Felipe Contreras
> > wrote:
>
> > FWIW I updated the patches and sent them to the dev mailing list so
> > they stay on the record:
>
On Thu, Mar 9, 2023 at 8:07 PM Felipe Contreras
wrote:
>
> On Wed, Mar 8, 2023 at 2:28 PM Uwe Brauer wrote:
> >
> > > On Mon, Mar 6, 2023 at 3:03 PM Uwe Brauer wrote:
> > And it seems that in
> > https://felipec.wordpress.com/2013/08/27/analysis-of-hg
improving hg <--> git export/import.
Indeed. I don't like Mercurial, but being forced to work with it has
made me see areas of improvement within Git, and this is one of them.
Cheers.
[1] https://github.com/felipec/git/commits/fc/tail
--
Felipe Contreras
--
You received this mes
ersonally never needed some sort of per-commit label (hg
branches), but sometimes I've lacked some marker to where a git branch
was started from. I believe that's the only instance in which hg
branches might give some benefit, but the same could be achieved with
branch@{tail}.
If branch@{
h.
Cheers.
[1]
https://felipec.wordpress.com/2012/05/26/no-mercurial-branches-are-still-not-better-than-git-ones-response-to-jhws-more-on-mercurial-vs-git-with-graphs/
[2] https://stackoverflow.com/questions/1527234/finding-a-branch-point-with-git
[3] https://felipec.wordpress.com/2013/08/27/an
check the wiki
[1], but basically.
* make install
* fpath=(~/.local/share/git-completion/zsh $fpath)
Enjoy.
[1] https://github.com/felipec/git-completion/wiki/Zsh
[2] https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/gitfast
[3] https://travis-ci.org/github/felipec/git-completion
--
Fel
On Sat, May 24, 2014 at 6:55 AM, Thomas Ferris Nicolaisen
wrote:
> On Friday, May 23, 2014 1:09:10 PM UTC+2, Felipe Contreras wrote:
>> I'm just letting you know that there's way too much spam in this list
>> to my liking, so I'm unsubscribing.
>
> Not sure i
constantly mark the messages as spam.
Cheers.
--
Felipe Contreras
--
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to git-users+unsubscr...@googlegroups.c
BRIS IS
>> > INFILTRATING PD TO KILL IT! PRO NAZIST DICTATOR, PRINCIPAL OF MURDERS &
>
> So now we're getting into reruns?
Enable moderation already.
--
Felipe Contreras
--
You received this message because you are subscribed to the Google Groups "Git
for human be
On Mon, May 12, 2014 at 10:50 PM, Felipe Contreras
wrote:
> I've been thinking about this and I think it's the wrong thing to do.
> I'll disable this "feature" by default in my fork (git-fc).
Here it is:
https://github.com/felipec/git/commit/0e59c7f2eef2e675098b4
to see everything, yes, but to me it looked he was
interested in the sequence of events, so --graph is not the best for
that.
--
Felipe Contreras
--
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To unsubscribe
s
> where added to each commit.
Probably `git log --decorate --oneline --diffstat`, or something like
that. There's tons of options to `git log`.
--
Felipe Contreras
--
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To
;feature" by default in my fork (git-fc).
Cheers.
--
Felipe Contreras
--
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to git-users+unsub
, so you would loose you own local commits if
> they aren't on a separate branch.
That's not true. His local commits are in "master", not
"origin/master". All systems have configured forced updates for remote
tracking branches. It's normal for "origin/master"
On Sat, May 3, 2014 at 6:41 AM, Jason Curl wrote:
> On Sat, May 3, 2014 at 1:11 PM, Felipe Contreras
> wrote:
>> I often do something similar. I think the easiest is to export GIT_DIR
>> to the repository you want to update, and then change directory where
>> you have
to export GIT_DIR
to the repository you want to update, and then change directory where
you have the content you want to compare.
You can do 'git diff' and 'git add' and 'git commit' and GIT_DIR repo
will be updated.
--
Felipe Contreras
--
You received this message bec
make
sense to checkout, and will replace that command with 'git checkout -b
foo origin/foo' (create a new branch 'foo' from the starting point
'origin/foo')
--
Felipe Contreras
--
You received this message because you are subscribed to the Google Groups "Git
f
. A command like this
usually does the trick:
git log --oneline --graph --decorate origin/master...master
> I have the available three books on git. What would you recommend in order
> to understand all of the above difficulties?
Why don't you use the link I sent to the ProGit book chapter abo
that tracks the remote branch
origin/Version_2_6_10pre. From Git's point of view, those are two
separate branches.
You can read more about remote tracking branches in the ProGit book:
http://git-scm.com/book/ch3-5.html
--
Felipe Contreras
--
You received this message because you are subs
f your local changes have diverged. You have to either merge or rebase.
'git pull' by default does a merge, but you can force it to do a
rebase: 'git pull --rebase'.
--
Felipe Contreras
--
You received this message because you are subscribed to the Google Groups "Git
fo
On Sat, Sep 21, 2013 at 1:33 AM, David Aguilar wrote:
> Felipe Contreras wrote:
>>I know 'git ci' is perfectly fine shortcut to 'git commit'.
>>
>>Either way, it doesn't matter. Even if we agree that /etc/gitconfig.d
>>is what we want, or we a
On Fri, Sep 20, 2013 at 7:44 PM, David Aguilar wrote:
> Felipe Contreras wrote:
>>David Aguilar wrote:
>>> Felipe Contreras wrote:
>>> >On Wed, Sep 18, 2013 at 9:30 PM, David Aguilar
>>> >wrote:
>>> >>>On Wed, Sep 18, 2013 at 1:13 PM
David Aguilar wrote:
> Felipe Contreras wrote:
> >On Wed, Sep 18, 2013 at 9:30 PM, David Aguilar
> >wrote:
> >>>On Wed, Sep 18, 2013 at 1:13 PM, David Aguilar
> >wrote:
> >>>>
> >>>> Will this not conflict with folks that supply the
27;t even have a
predefined /etc/gitconfig, that creates more inconsistency, as
everybody's configs and aliases are very very different.
This patch would definitely make things more consistent.
--
Felipe Contreras
--
You received this message because you are subscribed to the Google
time reading the config, and also prevent users from
> overriding these?
But we want them to be easily readable, and possibly allow
distributions to easily modify them.
--
Felipe Contreras
--
You received this message because you are subscribed to the Google Groups "Git
for human bei
43 matches
Mail list logo
