summaryrefslogtreecommitdiff
path: root/Documentation/git-add.txt
diff options
context:
space:
mode:
authorLibravatar Emily Shaffer <emilyshaffer@google.com>2020-08-03 11:57:49 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-08-03 12:48:00 -0700
commitb87528c4d7b0a28430da405f8f4b18f2fb8b953b (patch)
treefb919456d345608a411630be2cc4fd8205c10d48 /Documentation/git-add.txt
parentThird batch (diff)
downloadtgif-b87528c4d7b0a28430da405f8f4b18f2fb8b953b.tar.xz
Revert "contrib: subtree: adjust test to change in fmt-merge-msg"
This reverts commit 508fd8e8baf3e18ee40b2cf0b8899188a8506d07. In 6e6029a8 (fmt-merge-msg: allow merge destination to be omitted again) we get back the behavior where merges against 'master', by default, do not include "into 'master'" at the end of the merge message. This test fix is no longer needed. Signed-off-by: Emily Shaffer <emilyshaffer@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-add.txt')
0 files changed, 0 insertions, 0 deletions