Merge branch 'en/t3433-rebase-stat-dirty-failure' into pu

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

Build Status

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-<commandname>.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://lore.kernel.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