gnu-system-discuss
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Making git as easy as CVS, for handling merge conflicts


From: Paul Smith
Subject: Re: Making git as easy as CVS, for handling merge conflicts
Date: Tue, 05 Nov 2019 15:01:32 -0500

On Mon, 2019-11-04 at 22:14 -0500, Richard Stallman wrote:
> However, it meant that my simple recipe for committing my changes
> did not work.

Without knowing what your recipe tries to do or what did not work about
it, we cannot comment.  Anyway, it doesn't seem that you're looking for
help with this.

I'll just say, for posterity, that avoiding staging is not difficult if
you have simple requirements.  A single command that creates a commit
containing all modified files without having to stage them first:

  git commit -a

You can also give a set of specific files to put into the commit, which
do not need to be staged first:

  git commit <file1> <file2> ...

You can also use interactive mode:

  git commit --interactive

(probably not what you are looking for).

> I will stick to CVS.

Of course people should use what they want.  The problem comes when the
other people working on the same project would prefer a different tool.
I don't know if that is, in practice, a limiting factor to anyone at
this point.




reply via email to

[Prev in Thread] Current Thread [Next in Thread]