aboutsummaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorStephan Beyer <s-beyer@gmx.net>2008-06-22 01:54:36 +0200
committerJunio C Hamano <gitster@pobox.com>2008-06-22 18:14:17 -0700
commit82936f295f803a8f1fbe2d89856e9371baa3536c (patch)
tree041daf3fa91239ae84d793caccfbc9537ed365ad /git-merge-octopus.sh
parent3b2bbe9b8584947e33e9149f605149530faa7361 (diff)
downloadgit-82936f295f803a8f1fbe2d89856e9371baa3536c.tar.gz
git-82936f295f803a8f1fbe2d89856e9371baa3536c.tar.xz
api-builtin.txt: update and fix typo
Mention NEED_WORK_TREE flag and command-list.txt. Fix "bulit-in" typo and AsciiDoc-formatting of a paragraph. Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions