Re: [git-users] [ANNOUNCE] git-fc 0.1: new fork of git for users

2023-05-24 Thread Felipe Contreras
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 ma

Re: [git-users] [ANNOUNCE] git-fc 0.1: new fork of git for users

2023-05-23 Thread Felipe Contreras
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 > > every

Re: [git-users] [ANNOUNCE] git-fc 0.1: new fork of git for users

2023-05-23 Thread Felipe Contreras
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 possibili

[git-users] [ANNOUNCE] git-fc 0.1: new fork of git for users

2023-05-22 Thread Felipe Contreras
nux 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' command stage: add helper to run commands stage: add 'add' subcommand stage: add 'remove' subcommand unstage

Re: [git-users] after pulling from remote, move last commit into a new branch and push

2023-05-01 Thread Felipe Contreras
hor: 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 remote repos

[git-users] Re: [Push solved, but pull?] (was: [and remote branch tracking])

2023-05-01 Thread Felipe Contreras
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. I would need to see an example. -- Feli

[git-users] Re: [and remote branch tracking]

2023-04-18 Thread Felipe Contreras
s/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 way to push.

[git-users] Re: [and remote branch tracking]

2023-04-17 Thread Felipe Contreras
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 that only once. > > But you can clone it once, set up al

[git-users] Re: [and remote branch tracking]

2023-04-17 Thread Felipe Contreras
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 about that step. After that you can just pull from one rep

[git-users] Re: [and remote branch tracking]

2023-04-16 Thread Felipe Contreras
fname: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 explained your use-case. Normally people push their branches, that they have in

[git-users] Re: [and remote branch tracking]

2023-04-16 Thread Felipe Contreras
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)' > >> >

[git-users] Re: [and remote branch tracking]

2023-04-16 Thread Felipe Contreras
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 branches with; git push --all > git checkout moderni

Re: [and remote branch tracking] (was: [git-users] what is the most efficient way to mirror a repository)

2023-04-15 Thread Felipe Contreras
e 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 whatever branches you have already tracked. Cheers. [1] https://

Re: [git-users] what is the most efficient way to mirror a repository

2023-04-15 Thread Felipe Contreras
stream 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" group. To uns

Re: [git-users] how is name-rev determined

2023-03-22 Thread Felipe Contreras
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], > >> >

Re: [git-users] how is name-rev determined

2023-03-22 Thread Felipe Contreras
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 -- You r

Re: [git-users] Perl dependency

2023-03-18 Thread Felipe Contreras
ther. 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 probably not acceptable by upstream. Chee

Re: [git-users] Remote helper connect --force argument

2023-03-18 Thread Felipe Contreras
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 subscrib

Re: [git-users] how is name-rev determined

2023-03-16 Thread Felipe Contreras
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: >

Re: [git-users] how is name-rev determined

2023-03-11 Thread Felipe Contreras
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

Re: [git-users] how is name-rev determined

2023-03-09 Thread Felipe Contreras
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 message because you are subscribed to the Google Group

Re: [git-users] how is name-rev determined

2023-03-06 Thread Felipe Contreras
rt 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@{tail} was available git name-rev would p

Re: [git-users] how is name-rev determined

2023-03-05 Thread Felipe Contreras
s://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/analysis-of-hg-and-git-bran

[git-users] git-completion 1.2 released

2020-11-19 Thread Felipe Contreras
ake 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 -- Felipe Contreras -- You received this

[git-users] Too much spam

2014-05-23 Thread Felipe Contreras
. -- 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.com. For more options, visit https://groups.google.com/d

Re: [git-users] What is the best way to visualize branch history line?

2014-05-13 Thread Felipe Contreras
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 from this group and stop receiving emails from it, send an email to git-users+unsubscr

Re: [git-users] strange issue related to rebase.

2014-05-12 Thread Felipe Contreras
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 to be overridden. -- Felipe Contreras -- You received this message because you are subscribed to the Google Groups

Re: [git-users] strange issue related to rebase.

2014-05-12 Thread Felipe Contreras
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+unsubscr...@googlegroups.com

Re: [git-users] What is the best way to visualize branch history line?

2014-05-12 Thread Felipe Contreras
the which files 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

Re: [git-users] Maintaining two loosely coupled repositories

2014-05-04 Thread Felipe Contreras
On Sat, May 3, 2014 at 6:41 AM, Jason Curl jcur...@gmail.com wrote: On Sat, May 3, 2014 at 1:11 PM, Felipe Contreras felipe.contre...@gmail.com 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

Re: [git-users] Maintaining two loosely coupled repositories

2014-05-03 Thread Felipe Contreras
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 because you are subscribed to the Google

Re: [git-users] How to list branches

2013-10-18 Thread Felipe Contreras
--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 about these? It's free. -- Felipe Contreras -- You received this message

Re: [git-users] How to list branches

2013-10-18 Thread Felipe Contreras
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 for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users

[git-users] Re: [PATCH] build: add default configuration

2013-09-21 Thread Felipe Contreras
On Sat, Sep 21, 2013 at 1:33 AM, David Aguilar dav...@gmail.com wrote: Felipe Contreras felipe.contre...@gmail.com 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 add an /usr/share/git

Re: [git-users] git rebase after a pull

2013-09-21 Thread Felipe Contreras
for this. Only if 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 for human beings group

[git-users] Re: [PATCH] build: add default configuration

2013-09-20 Thread Felipe Contreras
David Aguilar wrote: Felipe Contreras felipe.contre...@gmail.com wrote: On Wed, Sep 18, 2013 at 9:30 PM, David Aguilar dav...@gmail.com wrote: On Wed, Sep 18, 2013 at 1:13 PM, David Aguilar dav...@gmail.com wrote: Will this not conflict with folks that supply their own gitconfig? You

[git-users] Re: [PATCH] build: add default configuration

2013-09-20 Thread Felipe Contreras
On Fri, Sep 20, 2013 at 7:44 PM, David Aguilar dav...@gmail.com wrote: Felipe Contreras felipe.contre...@gmail.com wrote: David Aguilar wrote: Felipe Contreras felipe.contre...@gmail.com wrote: On Wed, Sep 18, 2013 at 9:30 PM, David Aguilar dav...@gmail.com wrote: On Wed, Sep 18, 2013 at 1:13

[git-users] Re: [PATCH] build: add default configuration

2013-09-18 Thread Felipe Contreras
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 beings group. To unsubscribe from

[git-users] Re: [PATCH] build: add default configuration

2013-09-18 Thread Felipe Contreras
. This patch would definitely make things more consistent. -- 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