git/subtree at bcd2c5eedecf473fa6b15ebda798ce54bb3c75ea - git

mirror of https://github.com/git/git.git synced 2026-01-12 13:53:11 +09:00

History

Emily Shaffer b87528c4d7 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>

2020-08-03 12:48:00 -07:00

Revert "contrib: subtree: adjust test to change in fmt-merge-msg"

2020-08-03 12:48:00 -07:00

.gitignore

subtree: add an install-html target

2014-10-15 15:17:08 -07:00

COPYING

Add 'contrib/subtree/' from commit 'd3a04e06c77d57978bb5230361c64946232cc346'

2012-04-09 20:22:55 -05:00

git-subtree.sh

contrib/subtree: ensure only one rev is provided

2019-03-12 17:38:03 +09:00

git-subtree.txt

Correct mispellings of ".gitmodule" to ".gitmodules"

2018-02-14 11:34:34 -08:00

INSTALL

Fix git-subtree install instructions

2012-04-09 22:26:19 -05:00

Makefile

subtree: fix build with AsciiDoctor 2

2020-04-08 12:10:36 -07:00

README

Add 'contrib/subtree/' from commit 'd3a04e06c77d57978bb5230361c64946232cc346'

2012-04-09 20:22:55 -05:00

todo

contrib/subtree: remove "push" command from the "todo" file

2015-11-06 09:32:33 -08:00

README

Please read git-subtree.txt for documentation.

Please don't contact me using github mail; it's slow, ugly, and worst of
all, redundant. Email me instead at apenwarr@gmail.com and I'll be happy to
help.

Avery