在user> (-> h2
z/xml-zip
z/down
z/right
z/down
z/down
z/down
z/right
cut)
;;{:tag :html, :attrs nil,
;; :content [{:tag :head, :attrs nil, :content nil}
;; {:tag :body, :attrs nil,
;; :content [{:tag :article, :attrs nil,
;; :content [{:tag :h1, :attrs nil,
;; :content [{:tag :img, :attrs {:href "some-url"}, :content nil} " some-text "]}]}]}]}
结帐时，我意外地将分支合并到git-svn：
trunk我还没有git checkout -b my_branch
# make and commit changes
git checkout trunk
git svn rebase
git merge my_branch
# resolve conflicts
，但对我来说，现在看起来我已经丢失了原来的dcommit并且有一个改组的提交历史记录：
trunk我现在认为如果我尝试$ tig
2016-09-19 15:09 other-dev o {trunk} remote changes
2016-09-19 15:01 me o changes on my_branch
2016-09-19 14:55 other-dev o remote changes
2016-09-19 14:33 me o changes on my_branch
2016-09-19 13:58 me o changes on my_branch
2016-09-19 13:44 other-dev o remote changes
2016-09-19 11:48 me o changes
2016-09-16 07:41 other-dev o changes
这种状态会发生不好的事情。
我想“撤消”整个合并，返回dcommit，重新定位my_branch并重新合并。
我提出的唯一想法是结帐trunk，删除remote/trunk并从local/trunk重新分支local/trunk。
在这种情况下，是否有更简单的方法来“撤消”合并？
答案 0 :(得分：1)
我想知道为什么# Dockerizing Neo4j Mazerunner: Dockerfile for building graph analytics
# applications.
FROM java:openjdk-8-jdk
MAINTAINER K.B. Name <kb@socialmoon.com>
USER root
# Set the default HDFS and Spark hosts
ENV SPARK_HOST local
ENV HDFS_HOST hdfs://hdfs:9000
ENV DRIVER_HOST mazerunner
ENV RABBITMQ_HOST localhost
ENV SPARK_EXECUTOR_MEMORY 6g
ENV HADOOP_HOME /etc/hadoop
ENV MAZERUNNER_HOME /etc/mazerunner
ENV CLASSPATH /etc/hadoop/conf:/etc/hadoop/*:/etc/mazerunner/*:/etc/mazerunner/lib/*
ENV SPARK_CLASSPATH /etc/hadoop/conf:/etc/hadoop/*:/etc/mazerunner/*:/etc/mazerunner/lib/*
RUN mkdir /etc/mazerunner
# Update apt-get
RUN apt-get update && \
apt-get -y -qq install erlang-nox && \
mkdir /etc/rabbitmq && \
echo "[{rabbit, [{loopback_users, []}]}]." > /etc/rabbitmq/rabbitmq.config && \
echo "deb http://www.rabbitmq.com/debian/ testing main" >/etc/apt/sources.list.d/rabbitmq.list && \
curl -quiet -L -o ~/rabbitmq-signing-key-public.asc http://www.rabbitmq.com/rabbitmq-signing-key-public.asc && \
apt-key add ~/rabbitmq-signing-key-public.asc && \
apt-get -qq update && \
apt-get -y -qq --allow-unauthenticated --force-yes install rabbitmq-server && \
apt-get clean
# Copy bootstrapper
COPY sbin/mazerunner.sh /etc/mazerunner/bootstrap.sh
RUN chown root:root /etc/mazerunner/bootstrap.sh
RUN chmod 700 /etc/mazerunner/bootstrap.sh
# Copy Spark's HDFS configurations
RUN mkdir /etc/hadoop
COPY conf/hadoop /etc/hadoop
# Copy Mazerunner service binary
WORKDIR /etc/mazerunner
RUN wget https://s3-us-west-1.amazonaws.com/mazerunner-artifacts/spark-1.1.2-RELEASE-driver.jar
ENV BOOTSTRAP /etc/mazerunner/bootstrap.sh
CMD ["/etc/mazerunner/bootstrap.sh", "-d"]
实际上没有显示合并。我尝试重现这一点，tig尝试按日期排序提交，即使是从不同的分支。但是通过分支视图，它向我展示了分支：
tig如果我用＆＃39; G＆＃39;
关闭分支视图2016-09-20 13:31 me M─┐ [master] Merge branch 'foo'
2016-09-20 13:31 me o │ f
2016-09-20 13:30 me │ o [foo] e
2016-09-20 13:29 me o │ d
2016-09-20 13:28 me o │ c
2016-09-20 13:27 me │ o b
2016-09-20 13:17 me I─┘ a
与您的类似，但没有2016-09-20 13:31 me [master] Merge branch 'foo'
2016-09-20 13:31 me f
2016-09-20 13:30 me [foo] e
2016-09-20 13:29 me d
2016-09-20 13:28 me c
2016-09-20 13:27 me b
2016-09-20 13:17 me a
提交标记，并显示合并提交。
除此之外，只需查看带有o的{{1}}的reflog，以便在合并之前找到主提交的SHA，然后在使用master时将master重置为该提交。 git reflog master已签出，git reset --hard <good commit-ish>如果您不是主人，并且现在不想查看。