Re: [git-users] where to place global gitignore

2021-03-29 Thread Alexandru Pătrănescu
On Thu, Mar 25, 2021, 02:44 Serena Li wrote: > Hello peeps in the git community! > > I am slowly learning about the gitignore files for projects and found out > that to prevent cluttering in the project .gitignore -> one can create a > global .gitignore outside the project folder! And some questi

Re: [git-users] Estimating the likeliness of a change leading to major conflicts

2020-11-19 Thread Alexandru Pătrănescu
On Thu, Nov 19, 2020 at 7:35 AM Tassilo Horn wrote: > > Philip Oakley writes: > > >> That's a good starter, although I'd rather have a less precise > >> solution which doesn't require that I've already done and committed > >> my changes, i.e., I'd rather run the script *before* I start changing >

Re: [git-users] Estimating the likeliness of a change leading to major conflicts

2020-11-17 Thread Alexandru Pătrănescu
Hi, I think you can just have a very simple script that for each branchX in branchList git checkout branchX for each branchY in branchList mergeResult = git merge branchY if mergeResult git reset HEAD~ else notify about conflict between branchX and branchY

Re: [git-users] Change in difftool behavior between 2.14 and later

2018-08-11 Thread Alexandru Pătrănescu
Hi, I would have expected this new version comparison to be the default behavior and to compare local files only if one commit is specified. I'm on mobile. Can you verify if that might have changed also. If not, wouldn't this be good for you? git difftool {commitsha} -- {file} Thanks, Alex On S

Re: [git-users] How to automate "git commit --amend"

2018-07-24 Thread Alexandru Pătrănescu
Hi, I see you are already using gerrit and know about https://github.com/GerritCodeReview/git-repo/blob/master/hooks/commit-msg That is reading, parsing and changing the commit message so I'm sure you can start with that. It will even be triggered at "git commit --amend --no-edit" to not display t

Re: [git-users] Trying to break "git pull --rebase"

2018-02-20 Thread Alexandru Pătrănescu
Hi, >From my experience things can get messy if you are doing also some local merges before pull --rebase and on the remote someone else pushed some merges also, or pushed just some normal commits. By messy I mean polluted history with duplicate commits that are hard to understand when you will l

Re: [git-users] Merging commits from previously separated repository

2017-07-05 Thread Alexandru Pătrănescu
Hi Amin, You an try using a patch: git format-patch and git am. While you're trying to fix it, you might want to think about creating a unidirectional flow strategy. Either commit in the big repo and trigger spliting it to small repos by running git subtree for each new commit. Or commit in the

Re: [git-users] Git on 2 computers and syn

2016-06-01 Thread Alexandru Pătrănescu
Hi, As BitBucket is high available I suggest to keep it as a main central repo. To have sync-ed copy of it you can have repos in any other places. Start them with *git clone --mirror * and update them once every minute with *git remote update --prune*. Alex On Wed, Jun 1, 2016 at 5:51 PM, Alai

Re: [git-users] Help with Migrating Git to SVN--merging projects

2016-01-19 Thread Alexandru Pătrănescu
I need to do > the same thing for the subtrees to convert it into a whole repository that > doesn't have subtrees? > > > On Tuesday, January 19, 2016 at 11:22:35 AM UTC-5, Alexandru Pătrănescu > wrote: > >> Hi Berin, >> >> If you manged to convert individ

Re: [git-users] Help with Migrating Git to SVN--merging projects

2016-01-19 Thread Alexandru Pătrănescu
Hi Berin, If you manged to convert individual svn repositories to git, each with corresponding directories inside, than it's a piece of cake to finish it. A git repository can have multiple trees in it. Just push all repositories into one but on different branch naming and then merge those branch

Re: [git-users] Forcing cleanup of garbage commit?

2015-09-15 Thread Alexandru Pătrănescu
Hi Michael, They are only locally but if you really care about removing them: git gc Alex On Wed, Sep 16, 2015 at 2:53 AM, Michael wrote: > What is the best way to clean up a dead commit? > > I have used git reset to rewind the branches. > I know that the commit in question is "dead". > I know

[git-users] Re: CRLF will be replaced by LF warning

2013-04-06 Thread Alexandru Pătrănescu
Even if you work on windows, I suggest using core.autocrlf = input, assuming you're not using notepad to edit text files but a nice ide that handles unix eol. Even notepad++ does it perfectly. And after this, just redo that big renormalization commit. On Friday, April 5, 2013 11:33:37 AM UTC+3

[git-users] Re: Stack Overflow Question: git group all unmerged commits in master

2013-04-03 Thread Alexandru Pătrănescu
As question are good to be answered, the result of the stackoverflow question resulted in this answer: http://stackoverflow.com/a/15768236/755194 Posting here just for the sake of question/answer indexing. On Saturday, March 23, 2013 8:08:55 PM UTC+2, Alexandru Pătrănescu wrote: > > Help m

[git-users] Stack Overflow Question: git group all unmerged commits in master

2013-03-23 Thread Alexandru Pătrănescu
Help me with this question: git find all unmerged commits in master grouped by the branches they were created in http://stackoverflow.com/q/15589862?sem=2 -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and

[git-users] Re: it's not safe to set password wtih git config, can we not set it,

2013-01-18 Thread Alexandru Pătrănescu
This is what we use at work: git config --global credential.helper 'cache --timeout 36000' won't ask for your poassword for 10 hours. You can read more about it here: http://www.kernel.org/pub/software/scm/git/docs/git-credential-cache.html If it's not working on windows you can use: git config -

Re: [git-users] Unable to push

2012-11-05 Thread Alexandru Pătrănescu
h://git@git./ (fetch) > originssh://git@git./ (push) > > On Monday, November 5, 2012 4:52:06 PM UTC-5, Alexandru Pătrănescu wrote: >> >> maybe you have multiple remotes and you pull from one and try to push to >> another. >> show us as possible an output fr

Re: [git-users] Unable to push

2012-11-05 Thread Alexandru Pătrănescu
maybe you have multiple remotes and you pull from one and try to push to another. show us as possible an output from: *git branch -avv* and *git remote -vv* * * On Monday, November 5, 2012 11:33:06 PM UTC+2, kramer.newsreader wrote: > > Yeah that's what I would figure, but it isn't the case. Git

Re: [git-users] Unable to push

2012-11-05 Thread Alexandru Pătrănescu
maybe you have multiple remotes and you pull from one and try to push to another. show us as possible an output from: *git branch -avv* and *git remote -vv* Alexandru Patranescu Tel: 0721378395 On Mon, Nov 5, 2012 at 11:33 PM, kramer.newsreader < kramer.newsrea...@gmail.com> wrote: > Yeah that

[git-users] Re: Why do I have to be a source control engineer just to be a software developer?

2012-10-29 Thread Alexandru Pătrănescu
Git is very different than other VCS (like SVN or whatever you used before). I suggest reading the Pro Git book with a clear mind, open to new ideas, not linking what you read with what you know that command did in other VCS. Git is really not that complicated, as his creator described it, it is

Re: [git-users] Unable to pull from remote branch

2012-10-17 Thread Alexandru Pătrănescu
check the pull command help! you could run: git fetch origin git rebase remotes/origin/nov2012 or git pull --rebase origin nov2012 On Wed, Oct 17, 2012 at 9:12 PM, kramer.newsreader < kramer.newsrea...@gmail.com> wrote: > Hi guys, > > FYI Git n00b here. > > I am having trouble pulling fro