mirror of
https://github.com/git/git.git
synced 2024-11-25 02:44:48 +08:00
b475e442e8
There is not a strong reason to hide this option, and git-merge already completes this one. Let's allow to complete this for all commands (and let git-completion.bash do the suppressing if needed). This makes --rerere-autoupdate completable for am, cherry-pick and revert. rebase completion is fixed manually because it's a shell script and does not benefit from --git-completion-helper. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
43 lines
1.2 KiB
C
43 lines
1.2 KiB
C
#ifndef RERERE_H
|
|
#define RERERE_H
|
|
|
|
#include "string-list.h"
|
|
|
|
struct pathspec;
|
|
|
|
#define RERERE_AUTOUPDATE 01
|
|
#define RERERE_NOAUTOUPDATE 02
|
|
#define RERERE_READONLY 04
|
|
|
|
/*
|
|
* Marks paths that have been hand-resolved and added to the
|
|
* index. Set in the util field of such paths after calling
|
|
* rerere_remaining.
|
|
*/
|
|
extern void *RERERE_RESOLVED;
|
|
|
|
struct rerere_dir;
|
|
struct rerere_id {
|
|
struct rerere_dir *collection;
|
|
int variant;
|
|
};
|
|
|
|
extern int setup_rerere(struct string_list *, int);
|
|
extern int rerere(int);
|
|
/*
|
|
* Given the conflict ID and the name of a "file" used for replaying
|
|
* the recorded resolution (e.g. "preimage", "postimage"), return the
|
|
* path to that filesystem entity. With "file" specified with NULL,
|
|
* return the path to the directory that houses these files.
|
|
*/
|
|
extern const char *rerere_path(const struct rerere_id *, const char *file);
|
|
extern int rerere_forget(struct pathspec *);
|
|
extern int rerere_remaining(struct string_list *);
|
|
extern void rerere_clear(struct string_list *);
|
|
extern void rerere_gc(struct string_list *);
|
|
|
|
#define OPT_RERERE_AUTOUPDATE(v) OPT_UYN(0, "rerere-autoupdate", (v), \
|
|
N_("update the index with reused conflict resolution if possible"))
|
|
|
|
#endif
|