From a55a8f5cd8142c4b5f438ea03aac155288643c6f Mon Sep 17 00:00:00 2001
From: fqx <qingxufan0923@163.com>
Date: Mon, 22 Nov 2021 16:11:13 +0800
Subject: [PATCH] --mixed

---
 test.js |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/test.js b/test.js
index 0cf663e..bc0b097 100644
--- a/test.js
+++ b/test.js
@@ -1,3 +1,18 @@
 gittest.fsdf
 
-feature1
\ No newline at end of file
+feature1
+
+feature:rebase
+
+develop:123
+
+develop:234
+
+feature:merge
+
+
+reset:base
+  --soft
+    123
+
+  --mixed
\ No newline at end of file

--
Gitblit v1.9.1