Re: [PATCH 1/5] rerere: avoid misrecording on a skipped or aborted rebase/am
From: Junio C Hamano <hidden>
Date: 2016-08-11 19:31:49
This is good, but Documentation/git-rerere.txt should talk about this new option you added.
Re: [PATCH 1/5] rerere: avoid misrecording on a skipped or aborted rebase/am
2 messages, 2 authors, 2016-08-11 · open the first message on its own page
[PATCH 6/5] git-rerere: document the 'clear' and 'diff' commands
From: Eric Wong <hidden>
Date: 2016-08-11 20:16:02
Signed-off-by: Eric Wong <redacted> --- Documentation/git-rerere.txt | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt
index 8b6b651..de65cce 100644
--- a/Documentation/git-rerere.txt
+++ b/Documentation/git-rerere.txt@@ -7,8 +7,7 @@ git-rerere - Reuse recorded resolve SYNOPSIS -------- -'git-rerere' - +'git-rerere' [clear|diff] DESCRIPTION -----------
@@ -167,6 +166,25 @@ would conflict the same way the test merge you resolved earlier. `git-rerere` is run by `git rebase` to help you resolve this conflict. +COMMANDS +-------- + +Normally, git-rerere is run without arguments or user-intervention. +However, it has several commands that allow it to interact with +its working state. + +'clear':: + +This resets the metadata used by rerere if a merge resolution is to be +is aborted. Calling gitlink:git-am[1] --skip or gitlink:git-rebase[1] +[--skip|--abort] will automatcally invoke this command. + +'diff':: + +This displays diffs for the current state of the resolution. It is +useful for tracking what has changed while the user is resolving +conflicts. Additional arguments are passed directly to the system +diff(1) command installed in PATH. Author ------
--
1.4.4.2.g860f4