[PATCH] rerere-autocommit option is added to facilitate auto-merge when rerere resolves all the conflicts automatically.

2015-07-14 Thread Sunil Kata
Signed-off-by: Sunil Kata --- Documentation/git-merge.txt | 8 +++- builtin/merge.c | 8 +++- rerere.h| 2 ++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 273a100..6c60286

[PATCH] rerere-autocommit option is added to facilitate auto-merge when rerere resolves all the conflicts automatically.

2015-07-14 Thread Sunil Kata
Signed-off-by: Sunil Kata --- Documentation/git-merge.txt | 8 +++- builtin/merge.c | 8 +++- rerere.h| 2 ++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 273a100..6c60286

[PATCH] rerere-autocommit option is added to facilitate auto-merge when rerere resolves all the conflicts automatically.

2015-07-14 Thread Sunil Kata
Signed-off-by: Sunil Kata --- Documentation/git-merge.txt | 8 +++- builtin/merge.c | 8 +++- rerere.h| 2 ++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 273a100..6c60286