On Wed, Feb 26, 2014 at 3:38 PM, Jonathan Nieder jrnie...@gmail.com wrote:
Andrew Wong wrote:
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -909,7 +909,8 @@ static int suggest_conflicts(int renormalizing)
fclose(fp);
rerere(allow_rerere_auto);
printf(_(Automatic merge
Andrew Wong andrew.k...@gmail.com writes:
On Wed, Feb 26, 2014 at 3:38 PM, Jonathan Nieder jrnie...@gmail.com wrote:
Andrew Wong wrote:
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -909,7 +909,8 @@ static int suggest_conflicts(int renormalizing)
fclose(fp);
Andrew Wong andrew.k...@gmail.com writes:
On Wed, Feb 26, 2014 at 3:38 PM, Jonathan Nieder jrnie...@gmail.com wrote:
Andrew Wong wrote:
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -909,7 +909,8 @@ static int suggest_conflicts(int renormalizing)
+ fix conflicts and
On Wed, Mar 5, 2014 at 1:29 PM, Junio C Hamano gits...@pobox.com wrote:
If the user said git merge while another git merge is still
outstanding, we would want to say You have not concluded your
previous merge and die, and you presumably want to add the same
how to abort message there. Such a
Andrew Wong andrew.k...@gmail.com writes:
... merge hints in the future as well.
I actually wish we did not have to add any hints in the first place.
Having one advice config/variable
for every single situation seems a bit overkill, and we would end up
with too many variables.
That goes
Signed-off-by: Andrew Wong andrew.k...@gmail.com
---
builtin/merge.c | 3 ++-
wt-status.c | 3 +++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index e576a7f..07af427 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -909,7 +909,8 @@
On Wed, Feb 26, 2014 at 3:38 PM, Jonathan Nieder jrnie...@gmail.com wrote:
Seems reasonable, but I worry about the command growing too noisy.
Could this be guarded by an advice.something setting? (See advice.*
in git-config(1) for what I mean.)
Ah, good idea. This seems to belong to
7 matches
Mail list logo
