On Thu, 20 Jun 2013 10:22:25 -0400
wor...@alum.mit.edu (Dale R. Worley) wrote:
> > Yes, pass the "--no-commit" option to `git merge` and it won't
> > automatically record a merge commit but will rather leave the
> > changes staged in the index. Then you'll be able to unstage the
> > changes made to index.php by running
> > $ git reset index.php
> > After that, commit as usually.
> My understanding is that one could also use this sequence:
> > git checkout master
> > git merge --no-commit bugfix
> and then selectively commit the changes one wanted to commit:
> > git commit login.php register.php
> Am I correct?
Yes, I beleive you're correct on this point.
> This would be somewhat easier to use if one wanted to then commit the
> remaining changes, as they would remain in the index for
> > git commit
Well, this is about different mindsets ;-)
Mine is that if we do not need a set of files, we drop changes in them
from the index, and then commit.
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
For more options, visit https://groups.google.com/groups/opt_out.