Code

History

Commits on ig/commit-debug to docs/technical29
  1. files, tree: make same-change conflict resolution configurableYuya Nishihara committed 1 year agoaf4fe21
  2. docs: standardize usage of term "colocate" without the hyphenBenjamin Tan committed 1 year agob70a12e
  3. conflicts: document the "same-change rule"Philip Metzger committed 1 year ago6cbb21f
  4. docs conflicts.md: clarify the revert example a bitIlya Grigoriev committed 1 year ago5a73518
  5. docs conflicts.md: fix confusing typoIlya Grigoriev committed 1 year ago1f14f7a
  6. docs: make technical conflicts doc better match our recent thinkingMartin von Zweigbergk committed 1 year ago92629de
  7. view: rename workspace "id" to "name"Yuya Nishihara committed 1 year ago3f5f872
  8. docs: fix missed rename of `LocalBackend` to `SimpleBackend`Vincent Ging Ho Yim committed 1 year ago7e1433a
  9. docs: update types diagram to reflect rename of `LocalBackend` to `SimpleBackend`Vincent Ging Ho Yim committed 1 year agoa523503
  10. lib: rename the LocalBackend to SimpleBackendPhilip Metzger committed 1 year agof8ab8a0
  11. docs: fix a mention of the deleted `jj checkout` commandMartin von Zweigbergk committed 1 year agofe06ef4
  12. docs: improve and convert library design diagram to SVGAustin Seipp committed 1 year agoa621d8c
  13. docs/cli: update URLs to from martinvonz user to jj-vcs orgMartin von Zweigbergk committed 1 year agob836e0a
  14. bookmarks: update some leftover uses of the word "branch"Martin von Zweigbergk committed 2 years ago1aa2aec
  15. op log: change "resolve concurrent" to "reconcile divergent"Martin von Zweigbergk committed 2 years agocc15ecf
  16. docs: update description of conflicts to be about tree-level conflictsMartin von Zweigbergk committed 3 years agoec7f9e7
  17. docs: More info about syncing `jj` repo with `rsync`Ilya Grigoriev committed 3 years agobe8be2e
  18. docs: markdown fixups, mostly to remove links pointing outside docsIlya Grigoriev committed 3 years ago8f29afa
  19. docs: correct stale info about which backends are dynamically chosenMartin von Zweigbergk committed 3 years ago28182db
  20. cargo: rename crates from `jujutsu`/`jujutsu-lib` to `jj-cli`/`jj-lib`Martin von Zweigbergk committed 3 years agoaac5b7a
  21. Fix invalid code linkKevin Liao committed 3 years ago44f3cff
  22. cleanup: consistently (?) put removed conflict terms before added onesMartin von Zweigbergk committed 3 years agod087e64
  23. docs: add architecture docMartin von Zweigbergk committed 3 years agoe3beb82
  24. docs: mention that the "view" object knows about all workspacesMartin von Zweigbergk committed 3 years ago1dbf4df
  25. docs: change "current checkout" to "working-copy commit"Martin von Zweigbergk committed 4 years ago6e23b5b
  26. docs: add technical doc about a conflict designMartin von Zweigbergk committed 4 years agob64ee14
  27. docs: some futher touch-ups of concurrency.mdMartin von Zweigbergk committed 4 years ago4e20548
  28. docs: fix a typo in concurrency docMartin von Zweigbergk committed 4 years ago4c45844
  29. docs: add technical doc about lock-free concurrency designMartin von Zweigbergk committed 4 years ago94fda79