Merge branch 'seq-builtin-dev' into mymaster
[git/sbeyer.git] / pick.h
blob7a74ad8baa2e64ebb346581a41215d10db144717
1 #ifndef PICK_H
2 #define PICK_H
4 #include "commit.h"
6 /* Pick flags: */
7 #define PICK_REVERSE 1 /* pick the reverse changes ("revert") */
8 #define PICK_ADD_NOTE 2 /* add note about original commit (unless conflict) */
9 /* We don't need a PICK_QUIET. This is done by
10 * setenv("GIT_MERGE_VERBOSITY", "0", 1); */
11 extern int pick_commit(struct commit *commit, int mainline, int flags, struct strbuf *msg);
13 #endif