Merge branch 'ds/commit-graph-lockfile-fix'

Update to ds/generation-numbers topic.

* ds/commit-graph-lockfile-fix:
  commit-graph: fix UX issue when .lock file exists
  commit-graph.txt: update design document
  merge: check config before loading commits
  commit: use generation number in remove_redundant()
  commit: add short-circuit to paint_down_to_common()
  commit: use generation numbers for in_merge_bases()
  ref-filter: use generation number for --contains
  commit-graph: always load commit-graph information
  commit: use generations in paint_down_to_common()
  commit-graph: compute generation numbers
  commit: add generation number to struct commit
  ref-filter: fix outdated comment on in_commit_list
tree: 33e27e4586004e0ef097f98a83e0fb359b9d637f
  1. .github/
  2. block-sha1/
  3. builtin/
  4. ci/
  5. compat/
  6. contrib/
  7. Documentation/
  8. ewah/
  9. git-gui/
  10. gitk-git/
  11. gitweb/
  12. mergetools/
  13. perl/
  14. po/
  15. ppc/
  16. refs/
  17. sha1dc/
  18. t/
  19. templates/
  20. vcs-svn/
  21. xdiff/
  22. .clang-format
  23. .gitattributes
  24. .gitignore
  25. .gitmodules
  26. .mailmap
  27. .travis.yml
  28. .tsan-suppressions
  29. abspath.c
  30. aclocal.m4
  31. advice.c
  32. advice.h
  33. alias.c
  34. alias.h
  35. alloc.c
  36. apply.c
  37. apply.h
  38. archive-tar.c
  39. archive-zip.c
  40. archive.c
  41. archive.h
  42. argv-array.c
  43. argv-array.h
  44. attr.c
  45. attr.h
  46. base85.c
  47. bisect.c
  48. bisect.h
  49. blame.c
  50. blame.h
  51. blob.c
  52. blob.h
  53. branch.c
  54. branch.h
  55. builtin.h
  56. bulk-checkin.c
  57. bulk-checkin.h
  58. bundle.c
  59. bundle.h
  60. cache-tree.c
  61. cache-tree.h
  62. cache.h
  63. chdir-notify.c
  64. chdir-notify.h
  65. check-builtins.sh
  66. check-racy.c
  67. check_bindir
  68. checkout.c
  69. checkout.h
  70. color.c
  71. color.h
  72. column.c
  73. column.h
  74. combine-diff.c
  75. command-list.txt
  76. commit-graph.c
  77. commit-graph.h
  78. commit-slab-decl.h
  79. commit-slab-impl.h
  80. commit-slab.h
  81. commit.c
  82. commit.h
  83. common-main.c
  84. config.c
  85. config.h
  86. config.mak.dev
  87. config.mak.in
  88. config.mak.uname
  89. configure.ac
  90. connect.c
  91. connect.h
  92. connected.c
  93. connected.h
  94. convert.c
  95. convert.h
  96. copy.c
  97. COPYING
  98. credential-cache--daemon.c
  99. credential-cache.c
  100. credential-store.c
  101. credential.c
  102. credential.h
  103. csum-file.c
  104. csum-file.h
  105. ctype.c
  106. daemon.c
  107. date.c
  108. decorate.c
  109. decorate.h
  110. delta.h
  111. detect-compiler
  112. diff-delta.c
  113. diff-lib.c
  114. diff-no-index.c
  115. diff.c
  116. diff.h
  117. diffcore-break.c
  118. diffcore-delta.c
  119. diffcore-order.c
  120. diffcore-pickaxe.c
  121. diffcore-rename.c
  122. diffcore.h
  123. dir-iterator.c
  124. dir-iterator.h
  125. dir.c
  126. dir.h
  127. editor.c
  128. entry.c
  129. environment.c
  130. exec-cmd.c
  131. exec-cmd.h
  132. fast-import.c
  133. fetch-object.c
  134. fetch-object.h
  135. fetch-pack.c
  136. fetch-pack.h
  137. fmt-merge-msg.h
  138. fsck.c
  139. fsck.h
  140. fsmonitor.c
  141. fsmonitor.h
  142. generate-cmdlist.sh
  143. gettext.c
  144. gettext.h
  145. git-add--interactive.perl
  146. git-archimport.perl
  147. git-bisect.sh
  148. git-compat-util.h
  149. git-cvsexportcommit.perl
  150. git-cvsimport.perl
  151. git-cvsserver.perl
  152. git-difftool--helper.sh
  153. git-filter-branch.sh
  154. git-instaweb.sh
  155. git-merge-octopus.sh
  156. git-merge-one-file.sh
  157. git-merge-resolve.sh
  158. git-mergetool--lib.sh
  159. git-mergetool.sh
  160. git-p4.py
  161. git-parse-remote.sh
  162. git-quiltimport.sh
  163. git-rebase--am.sh
  164. git-rebase--interactive.sh
  165. git-rebase--merge.sh
  166. git-rebase.sh
  167. git-remote-testgit.sh
  168. git-request-pull.sh
  169. git-send-email.perl
  170. git-sh-i18n.sh
  171. git-sh-setup.sh
  172. git-stash.sh
  173. git-submodule.sh
  174. git-svn.perl
  175. GIT-VERSION-GEN
  176. git-web--browse.sh
  177. git.c
  178. git.rc
  179. gpg-interface.c
  180. gpg-interface.h
  181. graph.c
  182. graph.h
  183. grep.c
  184. grep.h
  185. hash.h
  186. hashmap.c
  187. hashmap.h
  188. help.c
  189. help.h
  190. hex.c
  191. http-backend.c
  192. http-fetch.c
  193. http-push.c
  194. http-walker.c
  195. http.c
  196. http.h
  197. ident.c
  198. imap-send.c
  199. INSTALL
  200. iterator.h
  201. khash.h
  202. kwset.c
  203. kwset.h
  204. levenshtein.c
  205. levenshtein.h
  206. LGPL-2.1
  207. line-log.c
  208. line-log.h
  209. line-range.c
  210. line-range.h
  211. list-objects-filter-options.c
  212. list-objects-filter-options.h
  213. list-objects-filter.c
  214. list-objects-filter.h
  215. list-objects.c
  216. list-objects.h
  217. list.h
  218. ll-merge.c
  219. ll-merge.h
  220. lockfile.c
  221. lockfile.h
  222. log-tree.c
  223. log-tree.h
  224. ls-refs.c
  225. ls-refs.h
  226. mailinfo.c
  227. mailinfo.h
  228. mailmap.c
  229. mailmap.h
  230. Makefile
  231. match-trees.c
  232. mem-pool.c
  233. mem-pool.h
  234. merge-blobs.c
  235. merge-blobs.h
  236. merge-recursive.c
  237. merge-recursive.h
  238. merge.c
  239. mergesort.c
  240. mergesort.h
  241. name-hash.c
  242. notes-cache.c
  243. notes-cache.h
  244. notes-merge.c
  245. notes-merge.h
  246. notes-utils.c
  247. notes-utils.h
  248. notes.c
  249. notes.h
  250. object-store.h
  251. object.c
  252. object.h
  253. oidmap.c
  254. oidmap.h
  255. oidset.c
  256. oidset.h
  257. pack-bitmap-write.c
  258. pack-bitmap.c
  259. pack-bitmap.h
  260. pack-check.c
  261. pack-objects.c
  262. pack-objects.h
  263. pack-revindex.c
  264. pack-revindex.h
  265. pack-write.c
  266. pack.h
  267. packfile.c
  268. packfile.h
  269. pager.c
  270. parse-options-cb.c
  271. parse-options.c
  272. parse-options.h
  273. patch-delta.c
  274. patch-ids.c
  275. patch-ids.h
  276. path.c
  277. path.h
  278. pathspec.c
  279. pathspec.h
  280. pkt-line.c
  281. pkt-line.h
  282. preload-index.c
  283. pretty.c
  284. pretty.h
  285. prio-queue.c
  286. prio-queue.h
  287. progress.c
  288. progress.h
  289. prompt.c
  290. prompt.h
  291. protocol.c
  292. protocol.h
  293. quote.c
  294. quote.h
  295. reachable.c
  296. reachable.h
  297. read-cache.c
  298. README.md
  299. ref-filter.c
  300. ref-filter.h
  301. reflog-walk.c
  302. reflog-walk.h
  303. refs.c
  304. refs.h
  305. refspec.c
  306. refspec.h
  307. remote-curl.c
  308. remote-testsvn.c
  309. remote.c
  310. remote.h
  311. replace-object.c
  312. replace-object.h
  313. repository.c
  314. repository.h
  315. rerere.c
  316. rerere.h
  317. resolve-undo.c
  318. resolve-undo.h
  319. revision.c
  320. revision.h
  321. run-command.c
  322. run-command.h
  323. send-pack.c
  324. send-pack.h
  325. sequencer.c
  326. sequencer.h
  327. serve.c
  328. serve.h
  329. server-info.c
  330. setup.c
  331. sh-i18n--envsubst.c
  332. sha1-array.c
  333. sha1-array.h
  334. sha1-file.c
  335. sha1-lookup.c
  336. sha1-lookup.h
  337. sha1-name.c
  338. sha1dc_git.c
  339. sha1dc_git.h
  340. shallow.c
  341. shell.c
  342. shortlog.h
  343. show-index.c
  344. sideband.c
  345. sideband.h
  346. sigchain.c
  347. sigchain.h
  348. split-index.c
  349. split-index.h
  350. strbuf.c
  351. strbuf.h
  352. streaming.c
  353. streaming.h
  354. string-list.c
  355. string-list.h
  356. sub-process.c
  357. sub-process.h
  358. submodule-config.c
  359. submodule-config.h
  360. submodule.c
  361. submodule.h
  362. symlinks.c
  363. tag.c
  364. tag.h
  365. tar.h
  366. tempfile.c
  367. tempfile.h
  368. thread-utils.c
  369. thread-utils.h
  370. tmp-objdir.c
  371. tmp-objdir.h
  372. trace.c
  373. trace.h
  374. trailer.c
  375. trailer.h
  376. transport-helper.c
  377. transport-internal.h
  378. transport.c
  379. transport.h
  380. tree-diff.c
  381. tree-walk.c
  382. tree-walk.h
  383. tree.c
  384. tree.h
  385. unicode-width.h
  386. unimplemented.sh
  387. unix-socket.c
  388. unix-socket.h
  389. unpack-trees.c
  390. unpack-trees.h
  391. upload-pack.c
  392. upload-pack.h
  393. url.c
  394. url.h
  395. urlmatch.c
  396. urlmatch.h
  397. usage.c
  398. userdiff.c
  399. userdiff.h
  400. utf8.c
  401. utf8.h
  402. varint.c
  403. varint.h
  404. version.c
  405. version.h
  406. versioncmp.c
  407. walker.c
  408. walker.h
  409. wildmatch.c
  410. wildmatch.h
  411. worktree.c
  412. worktree.h
  413. wrap-for-bin.sh
  414. wrapper.c
  415. write-or-die.c
  416. ws.c
  417. wt-status.c
  418. wt-status.h
  419. xdiff-interface.c
  420. xdiff-interface.h
  421. zlib.c
README.md

Git - fast, scalable, distributed revision control system

Git is a fast, scalable, distributed revision control system with an unusually rich command set that provides both high-level operations and full access to internals.

Git is an Open Source project covered by the GNU General Public License version 2 (some parts of it are under different licenses, compatible with the GPLv2). It was originally written by Linus Torvalds with help of a group of hackers around the net.

Please read the file INSTALL for installation instructions.

Many Git online resources are accessible from https://git-scm.com/ including full documentation and Git related tools.

See Documentation/gittutorial.txt to get started, then see Documentation/giteveryday.txt for a useful minimum set of commands, and Documentation/git-.txt for documentation of each command. If git has been correctly installed, then the tutorial can also be read with man gittutorial or git help tutorial, and the documentation of each command with man git-<commandname> or git help <commandname>.

CVS users may also want to read Documentation/gitcvs-migration.txt (man gitcvs-migration or git help cvs-migration if git is installed).

The user discussion and development of Git take place on the Git mailing list -- everyone is welcome to post bug reports, feature requests, comments and patches to git@vger.kernel.org (read Documentation/SubmittingPatches for instructions on patch submission). To subscribe to the list, send an email with just “subscribe git” in the body to majordomo@vger.kernel.org. The mailing list archives are available at https://public-inbox.org/git/, http://marc.info/?l=git and other archival sites.

Issues which are security relevant should be disclosed privately to the Git Security mailing list git-security@googlegroups.com.

The maintainer frequently sends the “What's cooking” reports that list the current status of various development topics to the mailing list. The discussion following them give a good reference for project status, development direction and remaining tasks.

The name “git” was given by Linus Torvalds when he wrote the very first version. He described the tool as “the stupid content tracker” and the name as (depending on your mood):

  • random three-letter combination that is pronounceable, and not actually used by any common UNIX command. The fact that it is a mispronunciation of “get” may or may not be relevant.
  • stupid. contemptible and despicable. simple. Take your pick from the dictionary of slang.
  • “global information tracker”: you're in a good mood, and it actually works for you. Angels sing, and a light suddenly fills the room.
  • “goddamn idiotic truckload of sh*t”: when it breaks