Junio C Hamano gits...@pobox.com writes:
Here is how I phrased in the one queued tentatively.
OK with me, thanks,
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More
'git commit -a' is rarely a good way to mark conflicts as resolved: the
user anyway has to go manually through the list of conflicts to do the
actual resolution, and it is usually better to use git add on each
files after doing the resolution.
On the other hand, using 'git commit -a' is
Matthieu Moy matthieu@imag.fr writes:
'git commit -a' is rarely a good way to mark conflicts as resolved: the
user anyway has to go manually through the list of conflicts to do the
actual resolution, and it is usually better to use git add on each
files after doing the resolution.
On
Junio C Hamano gits...@pobox.com writes:
Matthieu Moy matthieu@imag.fr writes:
'git commit -a' is rarely a good way to mark conflicts as resolved: the
user anyway has to go manually through the list of conflicts to do the
actual resolution, and it is usually better to use git add on each
Matthieu Moy wrote:
Signed-off-by: Matthieu Moy matthieu@imag.fr
[...]
---
advice.c| 3 +--
git-pull.sh | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
Thanks for taking it on.
Reviewed-by: Jonathan Nieder jrnie...@gmail.com
[...]
It was already on my todo-list, as a
Subject: [PATCH] merge, pull: stop advising 'commit -a' in case of conflict
'git commit -a' is rarely a good way to mark conflicts as resolved:
the user anyway has to go manually through the list of conflicts to
do the actual resolution, and it is usually better to use git add
on each files after
6 matches
Mail list logo
