diff options
author | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
---|---|---|
committer | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
commit | 93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch) | |
tree | 85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/rebase.h | |
parent | 6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff) |
revert(3p/git): Revert merge of git upstream at v2.26.2 r/852
This causes cgit to serve error pages, which is undesirable. This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing changes made to f2b211131f2347342dde63975b09cf603149f1a3.
Diffstat (limited to 'third_party/git/rebase.h')
-rw-r--r-- | third_party/git/rebase.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/third_party/git/rebase.h b/third_party/git/rebase.h deleted file mode 100644 index cc723d474895..000000000000 --- a/third_party/git/rebase.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef REBASE_H -#define REBASE_H - -enum rebase_type { - REBASE_INVALID = -1, - REBASE_FALSE = 0, - REBASE_TRUE, - REBASE_PRESERVE, - REBASE_MERGES, - REBASE_INTERACTIVE -}; - -enum rebase_type rebase_parse_value(const char *value); - -#endif /* REBASE */ |