Skip to content

Commit f3caeb9

Browse files
gitstergitster
committed
Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint
* 'maint' of git://linux-nfs.org/~bfields/git: core-tutorial: minor cleanup documentation: replace Discussion section by link to user-manual chapter user-manual: todo updates and cleanup user-manual: fix introduction to packfiles user-manual: move packfile and dangling object discussion user-manual: rewrite object database discussion user-manual: reorder commit, blob, tree discussion user-manual: rewrite index discussion user-manual: create new "low-level git operations" chapter user-manual: rename "git internals" to "git concepts" user-manual: move object format details to hacking-git chapter user-manual: adjust section levels in "git internals"
2 parents 023756f + a85feca commit f3caeb9

File tree

5 files changed

+548
-1003
lines changed

5 files changed

+548
-1003
lines changed

‎Documentation/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ cmd-list.made: cmd-list.perl $(MAN1_TXT)
123123
perl ./cmd-list.perl
124124
date >$@
125125

126-
git.7 git.html: git.txt core-intro.txt
126+
git.7 git.html: git.txt
127127

128128
clean:
129129
$(RM) *.xml *.xml+ *.html *.html+ *.1 *.5 *.7 *.texi *.texi+ howto-index.txt howto/*.html doc.dep

0 commit comments

Comments
 (0)