Skip to content

Commit 44148f2

Browse files
gitstergitster
committed
Merge remote branch 'ko/master' into HEAD
* ko/master: (366 commits) Update draft release notes to 1.6.6 before merging topics for -rc1 Makefile: do not clean arm directory Add a notice that only certain functions can print color escape codes builtin-apply.c: pay attention to -p<n> when determining the name gitworkflows: Consistently back-quote git commands Explicitly truncate bswap operand to uint32_t t1200: fix a timing dependent error Documentation: update descriptions of revision options related to '--bisect' Enable support for IPv6 on MinGW Refactor winsock initialization into a separate function t/gitweb-lib: Split HTTP response with non-GNU sed pack-objects: split implications of --all-progress from progress activation instaweb: restart server if already running prune-packed: only show progress when stderr is a tty remote-curl.c: fix rpc_out() Protect scripted Porcelains from GREP_OPTIONS insanity mergetool--lib: simplify guess_merge_tool() strbuf_add_wrapped_text(): skip over colour codes t4014-format-patch: do not assume 'test' is available as non-builtin Fix over-simplified documentation for 'git log -z' ...
2 parents ed87465 + 66abce0 commit 44148f2

File tree

320 files changed

+15901
-2456
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

320 files changed

+15901
-2456
lines changed

‎.gitignore

Lines changed: 180 additions & 177 deletions
Original file line numberDiff line numberDiff line change
@@ -1,184 +1,187 @@
1-
GIT-BUILD-OPTIONS
2-
GIT-CFLAGS
3-
GIT-GUI-VARS
4-
GIT-VERSION-FILE
5-
git
6-
git-add
7-
git-add--interactive
8-
git-am
9-
git-annotate
10-
git-apply
11-
git-archimport
12-
git-archive
13-
git-bisect
14-
git-bisect--helper
15-
git-blame
16-
git-branch
17-
git-bundle
18-
git-cat-file
19-
git-check-attr
20-
git-check-ref-format
21-
git-checkout
22-
git-checkout-index
23-
git-cherry
24-
git-cherry-pick
25-
git-clean
26-
git-clone
27-
git-commit
28-
git-commit-tree
29-
git-config
30-
git-count-objects
31-
git-cvsexportcommit
32-
git-cvsimport
33-
git-cvsserver
34-
git-daemon
35-
git-diff
36-
git-diff-files
37-
git-diff-index
38-
git-diff-tree
39-
git-difftool
40-
git-difftool--helper
41-
git-describe
42-
git-fast-export
43-
git-fast-import
44-
git-fetch
45-
git-fetch--tool
46-
git-fetch-pack
47-
git-filter-branch
48-
git-fmt-merge-msg
49-
git-for-each-ref
50-
git-format-patch
51-
git-fsck
52-
git-fsck-objects
53-
git-gc
54-
git-get-tar-commit-id
55-
git-grep
56-
git-hash-object
57-
git-help
58-
git-http-fetch
59-
git-http-push
60-
git-imap-send
61-
git-index-pack
62-
git-init
63-
git-init-db
64-
git-instaweb
65-
git-log
66-
git-lost-found
67-
git-ls-files
68-
git-ls-remote
69-
git-ls-tree
70-
git-mailinfo
71-
git-mailsplit
72-
git-merge
73-
git-merge-base
74-
git-merge-index
75-
git-merge-file
76-
git-merge-tree
77-
git-merge-octopus
78-
git-merge-one-file
79-
git-merge-ours
80-
git-merge-recursive
81-
git-merge-resolve
82-
git-merge-subtree
83-
git-mergetool
84-
git-mergetool--lib
85-
git-mktag
86-
git-mktree
87-
git-name-rev
88-
git-mv
89-
git-pack-redundant
90-
git-pack-objects
91-
git-pack-refs
92-
git-parse-remote
93-
git-patch-id
94-
git-peek-remote
95-
git-prune
96-
git-prune-packed
97-
git-pull
98-
git-push
99-
git-quiltimport
100-
git-read-tree
101-
git-rebase
102-
git-rebase--interactive
103-
git-receive-pack
104-
git-reflog
105-
git-relink
106-
git-remote
107-
git-remote-curl
108-
git-repack
109-
git-replace
110-
git-repo-config
111-
git-request-pull
112-
git-rerere
113-
git-reset
114-
git-rev-list
115-
git-rev-parse
116-
git-revert
117-
git-rm
118-
git-send-email
119-
git-send-pack
120-
git-sh-setup
121-
git-shell
122-
git-shortlog
123-
git-show
124-
git-show-branch
125-
git-show-index
126-
git-show-ref
127-
git-stage
128-
git-stash
129-
git-status
130-
git-stripspace
131-
git-submodule
132-
git-svn
133-
git-symbolic-ref
134-
git-tag
135-
git-tar-tree
136-
git-unpack-file
137-
git-unpack-objects
138-
git-update-index
139-
git-update-ref
140-
git-update-server-info
141-
git-upload-archive
142-
git-upload-pack
143-
git-var
144-
git-verify-pack
145-
git-verify-tag
146-
git-web--browse
147-
git-whatchanged
148-
git-write-tree
149-
git-core-*/?*
150-
gitk-wish
151-
gitweb/gitweb.cgi
152-
test-chmtime
153-
test-ctype
154-
test-date
155-
test-delta
156-
test-dump-cache-tree
157-
test-genrandom
158-
test-match-trees
159-
test-parse-options
160-
test-path-utils
161-
test-sha1
162-
test-sigchain
163-
common-cmds.h
1+
/GIT-BUILD-OPTIONS
2+
/GIT-CFLAGS
3+
/GIT-GUI-VARS
4+
/GIT-VERSION-FILE
5+
/git
6+
/git-add
7+
/git-add--interactive
8+
/git-am
9+
/git-annotate
10+
/git-apply
11+
/git-archimport
12+
/git-archive
13+
/git-bisect
14+
/git-bisect--helper
15+
/git-blame
16+
/git-branch
17+
/git-bundle
18+
/git-cat-file
19+
/git-check-attr
20+
/git-check-ref-format
21+
/git-checkout
22+
/git-checkout-index
23+
/git-cherry
24+
/git-cherry-pick
25+
/git-clean
26+
/git-clone
27+
/git-commit
28+
/git-commit-tree
29+
/git-config
30+
/git-count-objects
31+
/git-cvsexportcommit
32+
/git-cvsimport
33+
/git-cvsserver
34+
/git-daemon
35+
/git-diff
36+
/git-diff-files
37+
/git-diff-index
38+
/git-diff-tree
39+
/git-difftool
40+
/git-difftool--helper
41+
/git-describe
42+
/git-fast-export
43+
/git-fast-import
44+
/git-fetch
45+
/git-fetch--tool
46+
/git-fetch-pack
47+
/git-filter-branch
48+
/git-fmt-merge-msg
49+
/git-for-each-ref
50+
/git-format-patch
51+
/git-fsck
52+
/git-fsck-objects
53+
/git-gc
54+
/git-get-tar-commit-id
55+
/git-grep
56+
/git-hash-object
57+
/git-help
58+
/git-http-backend
59+
/git-http-fetch
60+
/git-http-push
61+
/git-imap-send
62+
/git-index-pack
63+
/git-init
64+
/git-init-db
65+
/git-instaweb
66+
/git-log
67+
/git-lost-found
68+
/git-ls-files
69+
/git-ls-remote
70+
/git-ls-tree
71+
/git-mailinfo
72+
/git-mailsplit
73+
/git-merge
74+
/git-merge-base
75+
/git-merge-index
76+
/git-merge-file
77+
/git-merge-tree
78+
/git-merge-octopus
79+
/git-merge-one-file
80+
/git-merge-ours
81+
/git-merge-recursive
82+
/git-merge-resolve
83+
/git-merge-subtree
84+
/git-mergetool
85+
/git-mergetool--lib
86+
/git-mktag
87+
/git-mktree
88+
/git-name-rev
89+
/git-mv
90+
/git-notes
91+
/git-pack-redundant
92+
/git-pack-objects
93+
/git-pack-refs
94+
/git-parse-remote
95+
/git-patch-id
96+
/git-peek-remote
97+
/git-prune
98+
/git-prune-packed
99+
/git-pull
100+
/git-push
101+
/git-quiltimport
102+
/git-read-tree
103+
/git-rebase
104+
/git-rebase--interactive
105+
/git-receive-pack
106+
/git-reflog
107+
/git-relink
108+
/git-remote
109+
/git-remote-curl
110+
/git-repack
111+
/git-replace
112+
/git-repo-config
113+
/git-request-pull
114+
/git-rerere
115+
/git-reset
116+
/git-rev-list
117+
/git-rev-parse
118+
/git-revert
119+
/git-rm
120+
/git-send-email
121+
/git-send-pack
122+
/git-sh-setup
123+
/git-shell
124+
/git-shortlog
125+
/git-show
126+
/git-show-branch
127+
/git-show-index
128+
/git-show-ref
129+
/git-stage
130+
/git-stash
131+
/git-status
132+
/git-stripspace
133+
/git-submodule
134+
/git-svn
135+
/git-symbolic-ref
136+
/git-tag
137+
/git-tar-tree
138+
/git-unpack-file
139+
/git-unpack-objects
140+
/git-update-index
141+
/git-update-ref
142+
/git-update-server-info
143+
/git-upload-archive
144+
/git-upload-pack
145+
/git-var
146+
/git-verify-pack
147+
/git-verify-tag
148+
/git-web--browse
149+
/git-whatchanged
150+
/git-write-tree
151+
/git-core-*/?*
152+
/gitk-git/gitk-wish
153+
/gitweb/gitweb.cgi
154+
/test-chmtime
155+
/test-ctype
156+
/test-date
157+
/test-delta
158+
/test-dump-cache-tree
159+
/test-genrandom
160+
/test-match-trees
161+
/test-parse-options
162+
/test-path-utils
163+
/test-sha1
164+
/test-sigchain
165+
/common-cmds.h
164166
*.tar.gz
165167
*.dsc
166168
*.deb
167-
git.spec
169+
/git.spec
168170
*.exe
169171
*.[aos]
170172
*.py[co]
171-
config.mak
172-
autom4te.cache
173-
config.cache
174-
config.log
175-
config.status
176-
config.mak.autogen
177-
config.mak.append
178-
configure
179-
tags
180-
TAGS
181-
cscope*
173+
*+
174+
/config.mak
175+
/autom4te.cache
176+
/config.cache
177+
/config.log
178+
/config.status
179+
/config.mak.autogen
180+
/config.mak.append
181+
/configure
182+
/tags
183+
/TAGS
184+
/cscope*
182185
*.obj
183186
*.lib
184187
*.sln
@@ -188,5 +191,5 @@ cscope*
188191
*.user
189192
*.idb
190193
*.pdb
191-
Debug/
192-
Release/
194+
/Debug/
195+
/Release/

‎Documentation/Makefile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,14 @@ ifdef DOCBOOK_SUPPRESS_SP
103103
XMLTO_EXTRA += -m manpage-suppress-sp.xsl
104104
endif
105105

106+
# If your target system uses GNU groff, it may try to render
107+
# apostrophes as a "pretty" apostrophe using unicode. This breaks
108+
# cut&paste, so you should set GNU_ROFF to force them to be ASCII
109+
# apostrophes. Unfortunately does not work with non-GNU roff.
110+
ifdef GNU_ROFF
111+
XMLTO_EXTRA += -m manpage-quote-apos.xsl
112+
endif
113+
106114
SHELL_PATH ?= $(SHELL)
107115
# Shell quote;
108116
SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))

0 commit comments

Comments
 (0)