summaryrefslogtreecommitdiff
path: root/Documentation/merge-strategies.txt
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2018-06-27 00:46:00 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-06-27 12:25:17 -0700
commitd7f590be8409363afad51519d3060188d33fb775 (patch)
tree74697b958d0aa76fc89075221ef4b70de31b0ee3 /Documentation/merge-strategies.txt
parentFix use of strategy options with interactive rebases (diff)
downloadtgif-d7f590be8409363afad51519d3060188d33fb775.tar.xz
git-rebase--merge: modernize "git-$cmd" to "git $cmd"
Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions