[git-users] Re: Git branches vs Mercurial branches

2021-12-02 Thread Mikko Rantalainen
Was: [Mystery solved, I owe you an apology] (was: [git-users] how to remove two commits from a remote server) On Wed, Dec 1, 2021 at 12:18 PM Uwe Brauer wrote: > As I said I am one of the maintainer of > matlab-mode(emacs), a git repository in sourceforge. Since I know > mercurial relatively

Re: [git-users] Change management practices

2021-08-30 Thread Mikko Rantalainen
On Sun, Aug 29, 2021 at 3:51 AM SJW wrote: > I will regularly create feature branches for each new enhancement or fix. > The problem rears its head when testing is delayed and the first feature > (feature-branch-1) is still not approved for production and sits as a > branch awaiting merge. > >

Re: [git-users] Changes made by "git commit --amend" against merged commit were lost when executing squash rebase

2019-10-18 Thread Mikko Rantalainen
On Fri, 18 Oct 2019 at 11:59, Benjamin wrote: > This could be an issue of git. The exact steps to reproduce this issue are > as below, > > $git merge master > ... >$git rebase -i e705c6a dev1 # e705c6a is the ancestor commit of > branch dev1 >In the interactive rebase page, Keep

Re: [git-users] Retrieve all files of a group of projects as they were at a given date

2019-05-15 Thread Mikko Rantalainen
On Wed, 15 May 2019, 14:04 Giorgio Forti, wrote: > I'm relatively new to Git. > I use it from inside Visual Studio 2013, for the normal operations: > commit, push ... > I used and know other similar products but not Git. > I'm searching in Git a feature I used in the past in another product. > >

Re: [git-users] Git Branching and Merging Strategy for a Shared Team Resource

2019-04-29 Thread Mikko Rantalainen
On Fri, 26 Apr 2019, 04:22 ckdev101, wrote: > > Here is the team make-up: > >- Sprint Team #1 >- Sprint Team #2 >- *Shared* DBA across teams >- Dev. Lead (Myself) > > ... > > The problem is that the shared DBA needs to constantly and consistently > make changes *across* teams for

Re: [git-users] Re: git rebase obscure and vague options

2019-04-07 Thread Mikko Rantalainen
On Sun, 7 Apr 2019, 20:46 , wrote: > > In the while, I come back to my original question: what is *--merge* command > line option of *git rebase* command? > Unless you have changed your default merge strategy that option does nothing if I've understood correctly. As far as I know, the rebase

Re: [git-users] Re: git rebase obscure and vague options

2019-04-07 Thread Mikko Rantalainen
On Sun, 7 Apr 2019, 20:46 , wrote: > >- ... however how to undo a rebasing (if possible) will be a future >deepening of mine, > > Rebase always creates technically new commits instead of replacing old commits. You can simply hard reset your branch wherever you want. Command "git reflog

Re: [git-users] Git revision number

2011-11-30 Thread Mikko Rantalainen
On Fri, Nov 18, 2011 at 07:11, PJ Weisberg p...@irregularexpressions.net wrote: I'm looking for something in Git analogous to the revision numbers in Subversion.  Pretty much exactly what you get from `git describe', but I don't want it to be dependent on any tags or refs.  Is there any way