global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-02-03 06:21:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 'sequencer-i' into HEAD

Browse Source
This commit is contained in:
Johannes Schindelin
2017-01-10 12:42:02 +01:00
parent 58e7864ffb 04fa3c86f6
commit 9edfaaeaac
2 changed files with 1013 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1105
sequencer.c
View File

File diff suppressed because it is too large Load Diff

4
sequencer.h
View File

@@ -7,7 +7,8 @@ const char *git_path_seq_dir(void);
enum replay_action {
REPLAY_REVERT,
REPLAY_PICK
REPLAY_PICK,
REPLAY_INTERACTIVE_REBASE
};
struct replay_opts {
@@ -23,6 +24,7 @@ struct replay_opts {
int allow_empty;
int allow_empty_message;
int keep_redundant_commits;
int verbose;
int mainline;