forked from QuantStack/git2cpp
-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathmerge_subcommand.hpp
More file actions
32 lines (25 loc) · 809 Bytes
/
merge_subcommand.hpp
File metadata and controls
32 lines (25 loc) · 809 Bytes
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
#pragma once
#include <CLI/CLI.hpp>
#include "../utils/common.hpp"
#include "../wrapper/repository_wrapper.hpp"
class merge_subcommand
{
public:
explicit merge_subcommand(const libgit2_object&, CLI::App& app);
void run();
private:
annotated_commit_list_wrapper resolve_heads(const repository_wrapper& repo);
void create_merge_commit(
repository_wrapper& repo,
const index_wrapper& index,
const std::vector<std::string>& branches_to_merge,
const annotated_commit_list_wrapper& commits_to_merge,
size_t num_commits_to_merge);
std::vector<std::string> m_branches_to_merge;
// bool m_no_ff = false;
// bool m_commit = false;
bool m_no_commit = false;
bool m_abort = false;
bool m_quit = false;
bool m_continue = false;
};