Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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'
  ...
  • Loading branch information...
commit 44148f2daf6e1ac3fe087dd07da2930411b3bcf2 2 parents ed87465 + 66abce0
Junio C Hamano authored November 29, 2009

Showing 301 changed files with 15,248 additions and 2,321 deletions. Show diff stats Hide diff stats

  1. 357  .gitignore
  2. 8  Documentation/Makefile
  3. 20  Documentation/RelNotes-1.6.5.1.txt
  4. 19  Documentation/RelNotes-1.6.5.2.txt
  5. 63  Documentation/RelNotes-1.6.5.3.txt
  6. 196  Documentation/RelNotes-1.6.6.txt
  7. 92  Documentation/config.txt
  8. 83  Documentation/diff-options.txt
  9. 64  Documentation/fetch-options.txt
  10. 8  Documentation/git-add.txt
  11. 41  Documentation/git-apply.txt
  12. 23  Documentation/git-bisect.txt
  13. 32  Documentation/git-check-ref-format.txt
  14. 26  Documentation/git-clone.txt
  15. 2  Documentation/git-commit.txt
  16. 19  Documentation/git-cvsserver.txt
  17. 24  Documentation/git-describe.txt
  18. 2  Documentation/git-difftool.txt
  19. 45  Documentation/git-fast-import.txt
  20. 43  Documentation/git-fetch.txt
  21. 13  Documentation/git-filter-branch.txt
  22. 46  Documentation/git-format-patch.txt
  23. 5  Documentation/git-fsck.txt
  24. 2  Documentation/git-gc.txt
  25. 178  Documentation/git-http-backend.txt
  26. 4  Documentation/git-http-push.txt
  27. 6  Documentation/git-ls-files.txt
  28. 33  Documentation/git-merge.txt
  29. 2  Documentation/git-mergetool.txt
  30. 60  Documentation/git-notes.txt
  31. 12  Documentation/git-pack-objects.txt
  32. 56  Documentation/git-pull.txt
  33. 19  Documentation/git-push.txt
  34. 2  Documentation/git-read-tree.txt
  35. 25  Documentation/git-rebase.txt
  36. 2  Documentation/git-receive-pack.txt
  37. 85  Documentation/git-remote-helpers.txt
  38. 7  Documentation/git-remote.txt
  39. 29  Documentation/git-replace.txt
  40. 4  Documentation/git-reset.txt
  41. 4  Documentation/git-send-email.txt
  42. 4  Documentation/git-send-pack.txt
  43. 3  Documentation/git-show-ref.txt
  44. 8  Documentation/git-submodule.txt
  45. 17  Documentation/git-svn.txt
  46. 6  Documentation/git-update-index.txt
  47. 14  Documentation/git-var.txt
  48. 11  Documentation/git.txt
  49. 10  Documentation/gitattributes.txt
  50. 26  Documentation/gitcore-tutorial.txt
  51. 2  Documentation/githooks.txt
  52. 115  Documentation/gitworkflows.txt
  53. 4  Documentation/glossary-content.txt
  54. 2  Documentation/howto/maintain-git.txt
  55. 4  Documentation/howto/revert-branch-rebase.txt
  56. 2  Documentation/howto/update-hook-example.txt
  57. 16  Documentation/manpage-quote-apos.xsl
  58. 2  Documentation/merge-config.txt
  59. 91  Documentation/merge-options.txt
  60. 5  Documentation/merge-strategies.txt
  61. 12  Documentation/pretty-formats.txt
  62. 22  Documentation/pt_BR/gittutorial.txt
  63. 11  Documentation/pull-fetch-param.txt
  64. 45  Documentation/rev-list-options.txt
  65. 5  Documentation/technical/api-history-graph.txt
  66. 535  Documentation/technical/pack-protocol.txt
  67. 187  Documentation/technical/protocol-capabilities.txt
  68. 96  Documentation/technical/protocol-common.txt
  69. 38  Documentation/user-manual.txt
  70. 2  GIT-VERSION-GEN
  71. 77  Makefile
  72. 2  RelNotes
  73. 2  advice.c
  74. 1  advice.h
  75. 4  archive.c
  76. 66  builtin-apply.c
  77. 7  builtin-blame.c
  78. 3  builtin-branch.c
  79. 40  builtin-check-ref-format.c
  80. 68  builtin-checkout.c
  81. 16  builtin-clone.c
  82. 2  builtin-commit-tree.c
  83. 53  builtin-commit.c
  84. 56  builtin-describe.c
  85. 1  builtin-diff-tree.c
  86. 210  builtin-fetch-pack.c
  87. 328  builtin-fetch.c
  88. 4  builtin-fsck.c
  89. 11  builtin-gc.c
  90. 21  builtin-grep.c
  91. 7  builtin-help.c
  92. 33  builtin-log.c
  93. 8  builtin-ls-files.c
  94. 6  builtin-ls-remote.c
  95. 100  builtin-ls-tree.c
  96. 12  builtin-mailinfo.c
  97. 2  builtin-mailsplit.c
  98. 6  builtin-merge-ours.c
  99. 2  builtin-merge-recursive.c
  100. 27  builtin-merge.c
  101. 8  builtin-mv.c
  102. 14  builtin-pack-objects.c
  103. 2  builtin-prune-packed.c
  104. 9  builtin-push.c
  105. 4  builtin-read-tree.c
  106. 50  builtin-receive-pack.c
  107. 3  builtin-reflog.c
  108. 192  builtin-remote.c
  109. 3  builtin-rerere.c
  110. 16  builtin-rev-list.c
  111. 21  builtin-rev-parse.c
  112. 120  builtin-send-pack.c
  113. 9  builtin-shortlog.c
  114. 4  builtin-show-branch.c
  115. 10  builtin-show-ref.c
  116. 4  builtin-stripspace.c
  117. 6  builtin-tar-tree.c
  118. 1  builtin-update-index.c
  119. 15  builtin-upload-archive.c
  120. 1  builtin.h
  121. 14  bundle.c
  122. 18  cache.h
  123. 7  color.h
  124. 2  command-list.txt
  125. 15  commit.c
  126. 24  commit.h
  127. 12  compat/bswap.h
  128. 196  compat/mingw.c
  129. 36  compat/mingw.h
  130. 3  compat/vcbuild/scripts/clink.pl
  131. 12  compat/win32mmap.c
  132. 17  config.c
  133. 43  configure.ac
  134. 22  connect.c
  135. 4  contrib/buildsystems/Generators/Vcproj.pm
  136. 3  contrib/buildsystems/engine.pl
  137. 105  contrib/completion/git-completion.bash
  138. 156  contrib/emacs/git-blame.el
  139. 8  { → contrib/examples}/builtin-fetch--tool.c
  140. 8  contrib/examples/git-merge.sh
  141. 2  contrib/examples/git-resolve.sh
  142. 5  contrib/fast-import/git-p4
  143. 5  contrib/fast-import/import-tars.perl
  144. 6  contrib/hooks/post-receive-email
  145. 51  daemon.c
  146. 2  diff-lib.c
  147. 4  diff-no-index.c
  148. 445  diff.c
  149. 3  diff.h
  150. 6  diffcore-break.c
  151. 7  diffcore-rename.c
  152. 32  editor.c
  153. 3  environment.c
  154. 91  fast-import.c
  155. 3  fetch-pack.h
  156. 1  fsck.h
  157. 23  git-add--interactive.perl
  158. 22  git-am.sh
  159. 15  git-bisect.sh
  160. 1  git-compat-util.h
  161. 17  git-cvsimport.perl
  162. 42  git-filter-branch.sh
  163. 43  git-gui/git-gui.sh
  164. 32  git-gui/lib/diff.tcl
  165. 16  git-gui/lib/remote_branch_delete.tcl
  166. 2,005  git-gui/po/el.po
  167. 5  git-gui/po/git-gui.pot
  168. 171  git-gui/po/glossary/el.po
  169. 28  git-gui/po/ru.po
  170. 29  git-instaweb.sh
  171. 2  git-merge-octopus.sh
  172. 12  git-merge-one-file.sh
  173. 30  git-mergetool--lib.sh
  174. 121  git-notes.sh
  175. 9  git-pull.sh
  176. 32  git-rebase--interactive.sh
  177. 4  git-rebase.sh
  178. 9  git-send-email.perl
  179. 27  git-sh-setup.sh
  180. 8  git-stash.sh
  181. 13  git-submodule.sh
  182. 218  git-svn.perl
  183. 29  git.c
  184. 10  gitweb/gitweb.css
  185. 473  gitweb/gitweb.perl
  186. 1  graph.h
  187. 13  grep.c
  188. 2  grep.h
  189. 655  http-backend.c
  190. 21  http-fetch.c
  191. 39  http-push.c
  192. 13  http.c
  193. 2  http.h
  194. 2  ident.c
  195. 241  imap-send.c
  196. 3  index-pack.c
  197. 26  log-tree.c
  198. 12  merge-recursive.c
  199. 429  notes.c
  200. 13  notes.h
  201. 3  pack-redundant.c
  202. 24  pager.c
  203. 130  path.c
  204. 84  pkt-line.c
  205. 4  pkt-line.h
  206. 113  pretty.c
  207. 8  progress.c
  208. 83  reflog-walk.c
  209. 8  reflog-walk.h
  210. 7  refs.c
  211. 2  refs.h
  212. 766  remote-curl.c
  213. 85  remote.c
  214. 3  remote.h
  215. 125  revision.c
  216. 5  revision.h
  217. 3  send-pack.h
  218. 38  setup.c
  219. 4  sha1_file.c
  220. 5  show-index.c
  221. 11  sideband.c
  222. 2  strbuf.h
  223. 114  submodule.c
  224. 8  submodule.h
  225. 16  t/gitweb-lib.sh
  226. 5  t/lib-git-svn.sh
  227. 24  t/lib-httpd/apache.conf
  228. 6  t/lib-rebase.sh
  229. 6  t/t1001-read-tree-m-2way.sh
  230. 224  t/t1200-tutorial.sh
  231. 61  t/t1402-check-ref-format.sh
  232. 40  t/t3003-ls-files-exclude.sh
  233. 89  t/t3101-ls-tree-dirname.sh
  234. 150  t/t3301-notes.sh
  235. 118  t/t3302-notes-index-expensive.sh
  236. 188  t/t3303-notes-subtrees.sh
  237. 14  t/t3404-rebase-interactive.sh
  238. 31  t/t3701-add-interactive.sh
  239. 2  t/t4013/diff.log_--decorate=full_--all
  240. 2  t/t4013/diff.log_--decorate_--all
  241. 37  t/t4014-format-patch.sh
  242. 11  t/t4015-diff-whitespace.sh
  243. 11  t/t4019-diff-wserror.sh
  244. 20  t/t4034-diff-words.sh
  245. 260  t/t4041-diff-submodule.sh
  246. 91  t/t4124-apply-ws-rule.sh
  247. 17  t/t4128-apply-root.sh
  248. 21  t/t4202-log.sh
  249. 6  t/t5100-mailinfo.sh
  250. 4  t/t5100/.gitattributes
  251. 35  t/t5100/0010
  252. 5  t/t5100/info0015
  253. 5  t/t5100/info0015--no-inbody-headers
  254. 5  t/t5100/info0016
  255. 5  t/t5100/info0016--no-inbody-headers
  256. 2  t/t5100/msg0015
  257. 3  t/t5100/msg0015--no-inbody-headers
  258. 2  t/t5100/msg0016
  259. 4  t/t5100/msg0016--no-inbody-headers
  260. 8  t/t5100/patch0015
  261. 8  t/t5100/patch0015--no-inbody-headers
  262. 8  t/t5100/patch0016
  263. 8  t/t5100/patch0016--no-inbody-headers
  264. 33  t/t5100/sample.mbox
  265. 9  t/t5303-pack-corruption-resilience.sh
  266. 13  t/t5505-remote.sh
  267. 21  t/t5506-remote-groups.sh
  268. 11  t/t5510-fetch.sh
  269. 154  t/t5514-fetch-multiple.sh
  270. 2  t/t5518-fetch-exit-status.sh
  271. 35  t/t5540-http-push.sh
  272. 92  t/t5541-http-push.sh
  273. 12  t/t5550-http-fetch.sh
  274. 105  t/t5551-http-fetch.sh
  275. 260  t/t5560-http-backend.sh
  276. 18  t/t6006-rev-list-format.sh
  277. 61  t/t6017-rev-list-stdin.sh
  278. 2  t/t6028-merge-up-to-date.sh
  279. 24  t/t6050-replace.sh
  280. 22  t/t6120-describe.sh
  281. 81  t/t7002-grep.sh
  282. 18  t/t7003-filter-branch.sh
  283. 47  t/t7005-editor.sh
  284. 16  t/t7400-submodule-basic.sh
  285. 49  t/t7501-commit.sh
  286. 9  t/t7502-commit.sh
  287. 41  t/t7600-merge.sh
  288. 2  t/t7800-difftool.sh
  289. 94  t/t9001-send-email.sh
  290. 4  t/t9115-git-svn-dcommit-funky-renames.sh
  291. 23  t/t9130-git-svn-authors-file.sh
  292. 108  t/t9146-git-svn-empty-dirs.sh
  293. 24  t/t9150-svk-mergetickets.sh
  294. 57  t/t9150/make-svk-dump
  295. 616  t/t9150/svk-merge.dump
  296. 26  t/t9151-svn-mergeinfo.sh
  297. 2  t/t9151/.gitignore
  298. 103  t/t9151/make-svnmerge-dump
  299. 1,010  t/t9151/svn-mergeinfo.dump
  300. 166  t/t9300-fast-import.sh
357  .gitignore
... ...
@@ -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
164 166
 *.tar.gz
165 167
 *.dsc
166 168
 *.deb
167  
-git.spec
  169
+/git.spec
168 170
 *.exe
169 171
 *.[aos]
170 172
 *.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*
182 185
 *.obj
183 186
 *.lib
184 187
 *.sln
@@ -188,5 +191,5 @@ cscope*
188 191
 *.user
189 192
 *.idb
190 193
 *.pdb
191  
-Debug/
192  
-Release/
  194
+/Debug/
  195
+/Release/
8  Documentation/Makefile
@@ -103,6 +103,14 @@ ifdef DOCBOOK_SUPPRESS_SP
103 103
 XMLTO_EXTRA += -m manpage-suppress-sp.xsl
104 104
 endif
105 105
 
  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
+
106 114
 SHELL_PATH ?= $(SHELL)
107 115
 # Shell quote;
108 116
 SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
20  Documentation/RelNotes-1.6.5.1.txt
... ...
@@ -0,0 +1,20 @@
  1
+GIT v1.6.5.1 Release Notes
  2
+==========================
  3
+
  4
+Fixes since v1.6.5
  5
+------------------
  6
+
  7
+ * An corrupt pack could make codepath to read objects into an
  8
+   infinite loop.
  9
+
  10
+ * Download throughput display was always shown in KiB/s but on fast links
  11
+   it is more appropriate to show it in MiB/s.
  12
+
  13
+ * "git grep -f filename" used uninitialized variable and segfaulted.
  14
+
  15
+ * "git clone -b branch" gave a wrong commit object name to post-checkout
  16
+   hook.
  17
+
  18
+ * "git pull" over http did not work on msys.
  19
+
  20
+Other minor documentation updates are included.
19  Documentation/RelNotes-1.6.5.2.txt
... ...
@@ -0,0 +1,19 @@
  1
+GIT v1.6.5.2 Release Notes
  2
+==========================
  3
+
  4
+Fixes since v1.6.5.1
  5
+--------------------
  6
+
  7
+ * Installation of templates triggered a bug in busybox when using tar
  8
+   implementation from it.
  9
+
  10
+ * "git add -i" incorrectly ignored paths that are already in the index
  11
+   if they matched .gitignore patterns.
  12
+
  13
+ * "git describe --always" should have produced some output even there
  14
+   were no tags in the repository, but it didn't.
  15
+
  16
+ * "git ls-files" when showing tracked files incorrectly paid attention
  17
+   to the exclude patterns.
  18
+
  19
+Other minor documentation updates are included.
63  Documentation/RelNotes-1.6.5.3.txt
... ...
@@ -0,0 +1,63 @@
  1
+Git v1.6.5.3 Release Notes
  2
+==========================
  3
+
  4
+Fixes since v1.6.5.2
  5
+--------------------
  6
+
  7
+ * info/grafts file didn't ignore trailing CR at the end of lines.
  8
+
  9
+ * Packages generated on newer FC were unreadable by older versions of
  10
+   RPM as the new default is to use stronger hash.
  11
+
  12
+ * output from "git blame" was unreadable when the file ended in an
  13
+   incomplete line.
  14
+
  15
+ * "git add -i/-p" didn't handle deletion of empty files correctly.
  16
+
  17
+ * "git clone" takes up to two parameters, but did not complain when
  18
+   given more arguments than necessary and silently ignored them.
  19
+
  20
+ * "git cvsimport" did not read files given as command line arguments
  21
+   correctly when it is run from a subdirectory.
  22
+
  23
+ * "git diff --color-words -U0" didn't work correctly.
  24
+
  25
+ * The handling of blank lines at the end of file by "git diff/apply
  26
+   --whitespace" was inconsistent with the other kinds of errors.
  27
+   They are now colored, warned against, and fixed the same way as others.
  28
+
  29
+ * There was no way to allow blank lines at the end of file without
  30
+   allowing extra blanks at the end of lines.  You can use blank-at-eof
  31
+   and blank-at-eol whitespace error class to specify them separately.
  32
+   The old trailing-space error class is now a short-hand to set both.
  33
+
  34
+ * "-p" option to "git format-patch" was supposed to suppress diffstat
  35
+   generation, but it was broken since 1.6.1.
  36
+
  37
+ * "git imap-send" did not compile cleanly with newer OpenSSL.
  38
+
  39
+ * "git help -a" outside of a git repository was broken.
  40
+
  41
+ * "git ls-files -i" was supposed to be inverse of "git ls-files" without -i
  42
+   with respect to exclude patterns, but it was broken since 1.6.5.2.
  43
+
  44
+ * "git ls-remote" outside of a git repository over http was broken.
  45
+
  46
+ * "git rebase -i" gave bogus error message when the command word was
  47
+   misspelled.
  48
+
  49
+ * "git receive-pack" that is run in response to "git push" did not run
  50
+   garbage collection nor update-server-info, but in larger hosting sites,
  51
+   these almost always need to be run.  To help site administrators, the
  52
+   command now runs "gc --auto" and "u-s-i" by setting receive.autogc
  53
+   and receive.updateserverinfo configuration variables, respectively.
  54
+
  55
+ * Release notes spelled the package name with incorrect capitalization.
  56
+
  57
+ * "gitweb" did not escape non-ascii characters correctly in the URL.
  58
+
  59
+ * "gitweb" showed "patch" link even for merge commits.
  60
+
  61
+ * "gitweb" showed incorrect links for blob line numbers in pathinfo mode.
  62
+
  63
+Other minor documentation updates are included.
196  Documentation/RelNotes-1.6.6.txt
... ...
@@ -0,0 +1,196 @@
  1
+Git v1.6.6 Release Notes
  2
+========================
  3
+
  4
+Notes on behaviour change
  5
+-------------------------
  6
+
  7
+ * In this release, "git fsck" defaults to "git fsck --full" and
  8
+   checks packfiles, and because of this it will take much longer to
  9
+   complete than before.  If you prefer a quicker check only on loose
  10
+   objects (the old default), you can say "git fsck --no-full".  This
  11
+   has been supported by 1.5.4 and newer versions of git, so it is
  12
+   safe to write it in your script even if you use slightly older git
  13
+   on some of your machines.
  14
+
  15
+Preparing yourselves for compatibility issues in 1.7.0
  16
+------------------------------------------------------
  17
+
  18
+In git 1.7.0, which is planned to be the release after 1.6.6, there will
  19
+be a handful of behaviour changes that will break backward compatibility.
  20
+
  21
+These changes were discussed long time ago and existing behaviours have
  22
+been identified as more problematic to the userbase than keeping them for
  23
+the sake of backward compatibility.
  24
+
  25
+When necessary, transition strategy for existing users has been designed
  26
+not to force them running around setting configuration variables and
  27
+updating their scripts in order to keep the traditional behaviour on the
  28
+day their sysadmin decides to install the new version of git.  When we
  29
+switched from "git-foo" to "git foo" in 1.6.0, even though the change had
  30
+been advertised and the transition guide had been provided for a very long
  31
+time, the users procrastinated during the entire transtion period, and
  32
+ended up panicking on the day their sysadmins updated their git.
  33
+
  34
+For changes decided to be in 1.7.0, we have been much louder to strongly
  35
+discourage such procrastination.  If you have been using recent versions
  36
+of git, you would have already seen warnings issued when you exercised
  37
+features whose behaviour will change, with the instruction on how to keep
  38
+the existing behaviour if you choose to.  You hopefully should be well
  39
+prepared already.
  40
+
  41
+Of course, we have also given "this and that will change in 1.7.0; prepare
  42
+yourselves" warnings in the release notes and announcement messages.
  43
+Let's see how well users will fare this time.
  44
+
  45
+ * "git push" into a branch that is currently checked out (i.e. pointed by
  46
+   HEAD in a repository that is not bare) will be refused by default.
  47
+
  48
+   Similarly, "git push $there :$killed" to delete the branch $killed
  49
+   in a remote repository $there, when $killed branch is the current
  50
+   branch pointed at by its HEAD, will be refused by default.
  51
+
  52
+   Setting the configuration variables receive.denyCurrentBranch and
  53
+   receive.denyDeleteCurrent to 'ignore' in the receiving repository
  54
+   can be used to override these safety features.  Versions of git
  55
+   since 1.6.2 have issued a loud warning when you tried to do them
  56
+   without setting the configuration, so repositories of people who
  57
+   still need to be able to perform such a push should already been
  58
+   future proofed.
  59
+
  60
+   Please refer to:
  61
+
  62
+   http://git.or.cz/gitwiki/GitFaq#non-bare
  63
+   http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
  64
+
  65
+   for more details on the reason why this change is needed and the
  66
+   transition process that already took place so far.
  67
+
  68
+ * "git send-email" will not make deep threads by default when sending a
  69
+   patch series with more than two messages.  All messages will be sent as
  70
+   a reply to the first message, i.e. cover letter.  It has been possible
  71
+   to configure send-email to do this by setting sendemail.chainreplyto
  72
+   configuration variable to false.  The only thing the new release will
  73
+   do is to change the default when you haven't configured that variable.
  74
+
  75
+ * "git status" will not be "git commit --dry-run".  This change does not
  76
+   affect you if you run the command without pathspec.
  77
+
  78
+   Nobody sane found the current behaviour of "git status Makefile" useful
  79
+   nor meaningful, and it confused users.  "git commit --dry-run" has been
  80
+   provided as a way to get the current behaviour of this command since
  81
+   1.6.5.
  82
+
  83
+ * "git diff" traditionally treated various "ignore whitespace" options
  84
+   only as a way to filter the patch output.  "git diff --exit-code -b"
  85
+   exited with non-zero status even if all changes were about changing the
  86
+   ammount of whitespace and nothing else.  and "git diff -b" showed the
  87
+   "diff --git" header line for such a change without patch text.
  88
+
  89
+   In 1.7.0, the "ignore whitespaces" will affect the semantics of the
  90
+   diff operation itself.  A change that does not affect anything but
  91
+   whitespaces will be reported with zero exit status when run with
  92
+   --exit-code, and there will not be "diff --git" header for such a
  93
+   change.
  94
+
  95
+
  96
+Updates since v1.6.5
  97
+--------------------
  98
+
  99
+(subsystems)
  100
+
  101
+ * various git-gui updates including new translations, wm states, etc.
  102
+
  103
+ * git-svn updates.
  104
+
  105
+ * "git fetch" over http learned a new mode that is different from the
  106
+   traditional "dumb commit walker".
  107
+
  108
+(portability)
  109
+
  110
+ * imap-send can be built on mingw port.
  111
+
  112
+(performance)
  113
+
  114
+ * "git diff -B" has smaller memory footprint.
  115
+
  116
+(usability, bells and whistles)
  117
+
  118
+ * The object replace mechanism can be bypassed with --no-replace-objects
  119
+   global option given to the "git" program.
  120
+
  121
+ * In configuration files, a few variables that name paths can begin with ~/
  122
+   and ~username/ and they are expanded as expected.
  123
+
  124
+ * "git subcmd -h" now shows short usage help for many more subcommands.
  125
+
  126
+ * "git bisect reset" can reset to an arbitrary commit.
  127
+
  128
+ * "git checkout frotz" when there is no local branch "frotz" but there
  129
+   is only one remote tracking branch "frotz" is taken as a request to
  130
+   start the named branch at the corresponding remote tracking branch.
  131
+
  132
+ * "git describe" can be told to add "-dirty" suffix with "--dirty" option.
  133
+
  134
+ * "git diff" learned --submodule option to show a list of one-line logs
  135
+   instead of differences between the commit object names.
  136
+
  137
+ * "git fetch" learned --all and --multiple options, to run fetch from
  138
+   many repositories, and --prune option to remove remote tracking
  139
+   branches that went stale.  These make "git remote update" and "git
  140
+   remote prune" less necessary (there is no plan to remove "remote
  141
+   update" nor "remote prune", though).
  142
+
  143
+ * "git fsck" by default checks the packfiles (i.e. "--full" is the
  144
+   default); you can turn it off with "git fsck --no-full".
  145
+
  146
+ * "git grep" can use -F (fixed strings) and -i (ignore case) together.
  147
+
  148
+ * import-tars contributed fast-import frontend learned more types of
  149
+   compressed tarballs.
  150
+
  151
+ * "git instaweb" knows how to talk with mod_cgid to apache2.
  152
+
  153
+ * "git log --decorate" shows the location of HEAD as well.
  154
+
  155
+ * "git log" and "git rev-list" learned to take revs and pathspecs from
  156
+   the standard input with the new "--stdin" option.
  157
+
  158
+ * "--pretty=format" option to "log" family of commands learned:
  159
+
  160
+   . to wrap text with the "%w()" specifier.
  161
+   . to show reflog information with "%g[sdD]" specifier.
  162
+
  163
+ * "git notes" command to annotate existing commits.
  164
+
  165
+ * "git merge" (and "git pull") learned --ff-only option to make it fail
  166
+   if the merge does not result in a fast-forward.
  167
+
  168
+ * "git mergetool" learned to use p4merge.
  169
+
  170
+ * "git rebase -i" learned "reword" that acts like "edit" but immediately
  171
+   starts an editor to tweak the log message without returning control to
  172
+   the shell, which is done by "edit" to give an opportunity to tweak the
  173
+   contents.
  174
+
  175
+ * In "git submodule add <repository> <path>", <path> is now optional and
  176
+   inferred from <repository> the same way "git clone <repository>" does.
  177
+
  178
+ * "git svn" learned to read SVN 1.5+ and SVK merge tickets.
  179
+
  180
+ * Author names shown in gitweb output are links to search commits by the
  181
+   author.
  182
+
  183
+
  184
+(developers)
  185
+
  186
+Fixes since v1.6.5
  187
+------------------
  188
+
  189
+All of the fixes in v1.6.5.X maintenance series are included in this
  190
+release, unless otherwise noted.
  191
+
  192
+---
  193
+exec >/var/tmp/1
  194
+echo O=$(git describe master)
  195
+O=v1.6.6-rc0-62-g7fc9d15
  196
+git shortlog --no-merges $O..master --not maint
92  Documentation/config.txt
@@ -126,12 +126,20 @@ advice.*::
126 126
 		Directions on how to stage/unstage/add shown in the
127 127
 		output of linkgit:git-status[1] and the template shown
128 128
 		when writing commit messages. Default: true.
  129
+	commitBeforeMerge::
  130
+		Advice shown when linkgit:git-merge[1] refuses to
  131
+		merge to avoid overwritting local changes.
  132
+		Default: true.
129 133
 --
130 134
 
131 135
 core.fileMode::
132 136
 	If false, the executable bit differences between the index and
133 137
 	the working copy are ignored; useful on broken filesystems like FAT.
134  
-	See linkgit:git-update-index[1]. True by default.
  138
+	See linkgit:git-update-index[1].
  139
++
  140
+The default is true, except linkgit:git-clone[1] or linkgit:git-init[1]
  141
+will probe and set core.fileMode false if appropriate when the
  142
+repository is created.
135 143
 
136 144
 core.ignoreCygwinFSTricks::
137 145
 	This option is only used by Cygwin implementation of Git. If false,
@@ -144,6 +152,18 @@ core.ignoreCygwinFSTricks::
144 152
 	is true, in which case ignoreCygwinFSTricks is ignored as Cygwin's
145 153
 	POSIX emulation is required to support core.filemode.
146 154
 
  155
+core.ignorecase::
  156
+	If true, this option enables various workarounds to enable
  157
+	git to work better on filesystems that are not case sensitive,
  158
+	like FAT. For example, if a directory listing finds
  159
+	"makefile" when git expects "Makefile", git will assume
  160
+	it is really the same file, and continue to remember it as
  161
+	"Makefile".
  162
++
  163
+The default is false, except linkgit:git-clone[1] or linkgit:git-init[1]
  164
+will probe and set core.ignorecase true if appropriate when the repository
  165
+is created.
  166
+
147 167
 core.trustctime::
148 168
 	If false, the ctime differences between the index and the
149 169
 	working copy are ignored; useful when the inode change time
@@ -169,9 +189,10 @@ core.autocrlf::
169 189
 	writing to the filesystem.  The variable can be set to
170 190
 	'input', in which case the conversion happens only while
171 191
 	reading from the filesystem but files are written out with
172  
-	`LF` at the end of lines.  Currently, which paths to consider
173  
-	"text" (i.e. be subjected to the autocrlf mechanism) is
174  
-	decided purely based on the contents.
  192
+	`LF` at the end of lines.  A file is considered
  193
+	"text" (i.e. be subjected to the autocrlf mechanism) based on
  194
+	the file's `crlf` attribute, or if `crlf` is unspecified,
  195
+	based on the file's contents.  See linkgit:gitattributes[5].
175 196
 
176 197
 core.safecrlf::
177 198
 	If true, makes git check if converting `CRLF` as controlled by
@@ -223,7 +244,11 @@ core.symlinks::
223 244
 	contain the link text. linkgit:git-update-index[1] and
224 245
 	linkgit:git-add[1] will not change the recorded type to regular
225 246
 	file. Useful on filesystems like FAT that do not support
226  
-	symbolic links. True by default.
  247
+	symbolic links.
  248
++
  249
+The default is true, except linkgit:git-clone[1] or linkgit:git-init[1]
  250
+will probe and set core.symlinks false if appropriate when the repository
  251
+is created.
227 252
 
228 253
 core.gitProxy::
229 254
 	A "proxy command" to execute (as 'command host port') instead
@@ -380,16 +405,15 @@ Common unit suffixes of 'k', 'm', or 'g' are supported.
380 405
 core.excludesfile::
381 406
 	In addition to '.gitignore' (per-directory) and
382 407
 	'.git/info/exclude', git looks into this file for patterns
383  
-	of files which are not meant to be tracked.  See
384  
-	linkgit:gitignore[5].
  408
+	of files which are not meant to be tracked.  "{tilde}/" is expanded
  409
+	to the value of `$HOME` and "{tilde}user/" to the specified user's
  410
+	home directory.  See linkgit:gitignore[5].
385 411
 
386 412
 core.editor::
387 413
 	Commands such as `commit` and `tag` that lets you edit
388 414
 	messages by launching an editor uses the value of this
389 415
 	variable when it is set, and the environment variable
390  
-	`GIT_EDITOR` is not set.  The order of preference is
391  
-	`GIT_EDITOR` environment, `core.editor`, `VISUAL` and
392  
-	`EDITOR` environment variables and then finally `vi`.
  416
+	`GIT_EDITOR` is not set.  See linkgit:git-var[1].
393 417
 
394 418
 core.pager::
395 419
 	The command that git will use to paginate output.  Can
@@ -416,13 +440,17 @@ core.whitespace::
416 440
 	consider them as errors.  You can prefix `-` to disable
417 441
 	any of them (e.g. `-trailing-space`):
418 442
 +
419  
-* `trailing-space` treats trailing whitespaces at the end of the line
  443
+* `blank-at-eol` treats trailing whitespaces at the end of the line
420 444
   as an error (enabled by default).
421 445
 * `space-before-tab` treats a space character that appears immediately
422 446
   before a tab character in the initial indent part of the line as an
423 447
   error (enabled by default).
424 448
 * `indent-with-non-tab` treats a line that is indented with 8 or more
425 449
   space characters as an error (not enabled by default).
  450
+* `blank-at-eof` treats blank lines added at the end of file as an error
  451
+  (enabled by default).
  452
+* `trailing-space` is a short-hand to cover both `blank-at-eol` and
  453
+  `blank-at-eof`.
426 454
 * `cr-at-eol` treats a carriage-return at the end of line as
427 455
   part of the line terminator, i.e. with it, `trailing-space`
428 456
   does not trigger if the character before such a carriage-return
@@ -454,6 +482,19 @@ On some file system/operating system combinations, this is unreliable.
454 482
 Set this config setting to 'rename' there; However, This will remove the
455 483
 check that makes sure that existing object files will not get overwritten.
456 484
 
  485
+core.notesRef::
  486
+	When showing commit messages, also show notes which are stored in
  487
+	the given ref.  This ref is expected to contain files named
  488
+	after the full SHA-1 of the commit they annotate.
  489
++
  490
+If such a file exists in the given ref, the referenced blob is read, and
  491
+appended to the commit message, separated by a "Notes:" line.  If the
  492
+given ref itself does not exist, it is not an error, but means that no
  493
+notes should be printed.
  494
++
  495
+This setting defaults to "refs/notes/commits", and can be overridden by
  496
+the `GIT_NOTES_REF` environment variable.
  497
+
457 498
 add.ignore-errors::
458 499
 	Tells 'git-add' to continue adding files when some files cannot be
459 500
 	added due to indexing errors. Equivalent to the '--ignore-errors'
@@ -666,6 +707,8 @@ color.ui::
666 707
 
667 708
 commit.template::
668 709
 	Specify a file to use as the template for new commit messages.
  710
+	"{tilde}/" is expanded to the value of `$HOME` and "{tilde}user/" to the
  711
+	specified user's home directory.
669 712
 
670 713
 diff.autorefreshindex::
671 714
 	When using 'git-diff' to compare with work tree
@@ -1089,6 +1132,14 @@ http.maxRequests::
1089 1132
 	How many HTTP requests to launch in parallel. Can be overridden
1090 1133
 	by the 'GIT_HTTP_MAX_REQUESTS' environment variable. Default is 5.
1091 1134
 
  1135
+http.postBuffer::
  1136
+	Maximum size in bytes of the buffer used by smart HTTP
  1137
+	transports when POSTing data to the remote system.
  1138
+	For requests larger than this buffer size, HTTP/1.1 and
  1139
+	Transfer-Encoding: chunked is used to avoid creating a
  1140
+	massive pack file locally.  Default is 1 MiB, which is
  1141
+	sufficient for most requests.
  1142
+
1092 1143
 http.lowSpeedLimit, http.lowSpeedTime::
1093 1144
 	If the HTTP transfer speed is less than 'http.lowSpeedLimit'
1094 1145
 	for longer than 'http.lowSpeedTime' seconds, the transfer is aborted.
@@ -1320,6 +1371,11 @@ rebase.stat::
1320 1371
 	Whether to show a diffstat of what changed upstream since the last
1321 1372
 	rebase. False by default.
1322 1373
 
  1374
+receive.autogc::
  1375
+	By default, git-receive-pack will run "git-gc --auto" after
  1376
+	receiving data from git-push and updating refs.  You can stop
  1377
+	it by setting this variable to false.
  1378
+
1323 1379
 receive.fsckObjects::
1324 1380
 	If it is set to true, git-receive-pack will check all received
1325 1381
 	objects. It will abort in the case of a malformed object or a
@@ -1351,10 +1407,14 @@ receive.denyCurrentBranch::
1351 1407
 
1352 1408
 receive.denyNonFastForwards::
1353 1409
 	If set to true, git-receive-pack will deny a ref update which is
1354  
-	not a fast forward. Use this to prevent such an update via a push,
  1410
+	not a fast-forward. Use this to prevent such an update via a push,
1355 1411
 	even if that push is forced. This configuration variable is
1356 1412
 	set when initializing a shared repository.
1357 1413
 
  1414
+receive.updateserverinfo::
  1415
+	If set to true, git-receive-pack will run git-update-server-info
  1416
+	after receiving data from git-push and updating refs.
  1417
+
1358 1418
 remote.<name>.url::
1359 1419
 	The URL of a remote repository.  See linkgit:git-fetch[1] or
1360 1420
 	linkgit:git-push[1].
@@ -1381,7 +1441,13 @@ remote.<name>.mirror::
1381 1441
 
1382 1442
 remote.<name>.skipDefaultUpdate::
1383 1443
 	If true, this remote will be skipped by default when updating
1384  
-	using the update subcommand of linkgit:git-remote[1].
  1444
+	using linkgit:git-fetch[1] or the `update` subcommand of
  1445
+	linkgit:git-remote[1].
  1446
+
  1447
+remote.<name>.skipFetchAll::
  1448
+	If true, this remote will be skipped by default when updating
  1449
+	using linkgit:git-fetch[1] or the `update` subcommand of
  1450
+	linkgit:git-remote[1].
1385 1451
 
1386 1452
 remote.<name>.receivepack::
1387 1453
 	The default program to execute on the remote side when pushing.  See
83  Documentation/diff-options.txt
@@ -14,7 +14,8 @@ endif::git-format-patch[]
14 14
 
15 15
 ifdef::git-format-patch[]
16 16
 -p::
17  
-	Generate patches without diffstat.
  17
+--no-stat::
  18
+	Generate plain patches without any diffstats.
18 19
 endif::git-format-patch[]
19 20
 
20 21
 ifndef::git-format-patch[]
@@ -27,33 +28,40 @@ endif::git-format-patch[]
27 28
 -U<n>::
28 29
 --unified=<n>::
29 30
 	Generate diffs with <n> lines of context instead of
30  
-	the usual three. Implies "-p".
  31
+	the usual three.
  32
+ifndef::git-format-patch[]
  33
+	Implies `-p`.
  34
+endif::git-format-patch[]
31 35
 
  36
+ifndef::git-format-patch[]
32 37
 --raw::
33 38
 	Generate the raw format.
34 39
 	{git-diff-core? This is the default.}
  40
+endif::git-format-patch[]
35 41
 
  42
+ifndef::git-format-patch[]
36 43
 --patch-with-raw::
37  
-	Synonym for "-p --raw".
  44
+	Synonym for `-p --raw`.
  45
+endif::git-format-patch[]
38 46
 
39 47
 --patience::
40 48
 	Generate a diff using the "patience diff" algorithm.
41 49
 
42 50
 --stat[=width[,name-width]]::
43 51
 	Generate a diffstat.  You can override the default
44  
-	output width for 80-column terminal by "--stat=width".
  52
+	output width for 80-column terminal by `--stat=width`.
45 53
 	The width of the filename part can be controlled by
46 54
 	giving another width to it separated by a comma.
47 55
 
48 56
 --numstat::
49  
-	Similar to \--stat, but shows number of added and
  57
+	Similar to `\--stat`, but shows number of added and
50 58
 	deleted lines in decimal notation and pathname without
51 59
 	abbreviation, to make it more machine friendly.  For
52 60
 	binary files, outputs two `-` instead of saying
53 61
 	`0 0`.
54 62
 
55 63
 --shortstat::
56  
-	Output only the last line of the --stat format containing total
  64
+	Output only the last line of the `--stat` format containing total
57 65
 	number of modified files, as well as number of added and deleted
58 66
 	lines.
59 67
 
@@ -61,24 +69,39 @@ endif::git-format-patch[]
61 69
 	Output the distribution of relative amount of changes (number of lines added or
62 70
 	removed) for each sub-directory. Directories with changes below
63 71
 	a cut-off percent (3% by default) are not shown. The cut-off percent
64  
-	can be set with "--dirstat=limit". Changes in a child directory is not
65  
-	counted for the parent directory, unless "--cumulative" is used.
  72
+	can be set with `--dirstat=limit`. Changes in a child directory is not
  73
+	counted for the parent directory, unless `--cumulative` is used.
66 74
 
67 75
 --dirstat-by-file[=limit]::
68  
-	Same as --dirstat, but counts changed files instead of lines.
  76
+	Same as `--dirstat`, but counts changed files instead of lines.
69 77
 
70 78
 --summary::
71 79
 	Output a condensed summary of extended header information
72 80
 	such as creations, renames and mode changes.
73 81
 
  82
+ifndef::git-format-patch[]
74 83
 --patch-with-stat::
75  
-	Synonym for "-p --stat".
76  
-	{git-format-patch? This is the default.}
  84
+	Synonym for `-p --stat`.
  85
+endif::git-format-patch[]
  86
+
  87
+ifndef::git-format-patch[]
77 88
 
78 89
 -z::
79  
-	NUL-line termination on output.  This affects the --raw
80  
-	output field terminator.  Also output from commands such
81  
-	as "git-log" will be delimited with NUL between commits.
  90
+ifdef::git-log[]
  91
+	Separate the commits with NULs instead of with new newlines.
  92
++
  93
+Also, when `--raw` or `--numstat` has been given, do not munge
  94
+pathnames and use NULs as output field terminators.
  95
+endif::git-log[]
  96
+ifndef::git-log[]
  97
+	When `--raw` or `--numstat` has been given, do not munge
  98
+	pathnames and use NULs as output field terminators.
  99
+endif::git-log[]
  100
++
  101
+Without this option, each pathname output will have TAB, LF, double quotes,
  102
+and backslash characters replaced with `\t`, `\n`, `\"`, and `\\`,
  103
+respectively, and the pathname will be enclosed in double quotes if
  104
+any of those replacements occurred.
82 105
 
83 106
 --name-only::
84 107
 	Show only names of changed files.
@@ -87,6 +110,13 @@ endif::git-format-patch[]
87 110
 	Show only names and status of changed files. See the description
88 111
 	of the `--diff-filter` option on what the status letters mean.
89 112
 
  113
+--submodule[=<format>]::
  114
+	Chose the output format for submodule differences. <format> can be one of
  115
+	'short' and 'log'. 'short' just shows pairs of commit names, this format
  116
+	is used when this option is not given. 'log' is the default value for this
  117
+	option and lists the commits in that commit range like the 'summary'
  118
+	option of linkgit:git-submodule[1] does.
  119
+
90 120
 --color::
91 121
 	Show colored diff.
92 122
 
@@ -110,16 +140,19 @@ The regex can also be set via a diff driver or configuration option, see
110 140
 linkgit:gitattributes[1] or linkgit:git-config[1].  Giving it explicitly
111 141
 overrides any diff driver or configuration setting.  Diff drivers
112 142
 override configuration settings.
  143
+endif::git-format-patch[]
113 144
 
114 145
 --no-renames::
115 146
 	Turn off rename detection, even when the configuration
116 147
 	file gives the default to do so.
117 148
 
  149
+ifndef::git-format-patch[]
118 150
 --check::
119 151
 	Warn if changes introduce trailing whitespace
120 152
 	or an indent that uses a space before a tab. Exits with
121 153
 	non-zero status if problems are found. Not compatible with
122 154
 	--exit-code.
  155
+endif::git-format-patch[]
123 156
 
124 157
 --full-index::
125 158
 	Instead of the first handful of characters, show the full
@@ -127,16 +160,16 @@ override configuration settings.
127 160
 	line when generating patch format output.
128 161
 
129 162
 --binary::
130  
-	In addition to --full-index, output "binary diff" that
131  
-	can be applied with "git apply".
  163
+	In addition to `--full-index`, output a binary diff that
  164
+	can be applied with `git-apply`.
132 165
 
133 166
 --abbrev[=<n>]::
134 167
 	Instead of showing the full 40-byte hexadecimal object
135 168
 	name in diff-raw fo