Code

History

Commits on ig/commit-debug5985+
  1. cli: merge trees via `MergedTree` in `jj move`Martin von Zweigbergk committed 3 years agobd6098e
  2. merged_tree: add a function for merging 3 `MergedTree`sMartin von Zweigbergk committed 3 years ago873a6f0
  3. commit_builder: take `MergedTreeId` for root id argumentMartin von Zweigbergk committed 3 years ago1674a42
  4. backout: propagate error from merging of treesMartin von Zweigbergk committed 3 years agoe5ec99d
  5. cli: migrate `jj untrack` to `MergedTree` APIMartin von Zweigbergk committed 3 years agob19afb6
  6. cli: migrate `jj restore` to `MergedTree` APIMartin von Zweigbergk committed 3 years ago6d89f0c
  7. cli: migrate `cat`, `files` & `git submodule print` to `MergedTree` APIMartin von Zweigbergk committed 3 years agoa0291e9
  8. cli: migrate most diff-editing functions to `MergedTree` APIMartin von Zweigbergk committed 3 years agod753c85
  9. nix: Add `poetry` to devDependencies for `nix develop`Ilya Grigoriev committed 3 years agod3428d6
  10. docs: goodbye Github, hello GitHubIlya Grigoriev committed 3 years agob67c115
  11. Github actions to build docsIlya Grigoriev committed 3 years agoc8bb8fb
  12. docs: markdown fixups, mostly to remove links pointing outside docsIlya Grigoriev committed 3 years ago8f29afa
  13. docs: Set up `mkdocs` and `poetry`Ilya Grigoriev committed 3 years agofc49258
  14. docs: change "shell script" codeblock to "shell"Ilya Grigoriev committed 3 years ago623c5e2
  15. docs: Move installation instructions from README to docs/Ilya Grigoriev committed 3 years ago64140c3
  16. docs: minor markdown fixupsIlya Grigoriev committed 3 years agod3bd1af
  17. cargo: bump the cargo-dependencies group with 3 updatesdependabot[bot] committed 3 years ago9d74194
  18. diff_util: use `MergedTree` throughoutMartin von Zweigbergk committed 3 years ago732e448
  19. diff_util: make `diff_content()` return empty for missing pathMartin von Zweigbergk committed 3 years ago5309335
  20. diff_util: unify handling of unexpected casesMartin von Zweigbergk committed 3 years ago5ef925d
  21. merge_tools: pass `MergedTree` to `run_mergetool()`Martin von Zweigbergk committed 3 years ago6df7db3
  22. merge_tools: pass `MergedTree`s to `edit_diff()`Martin von Zweigbergk committed 3 years ago17fe5e3
  23. merge_tools: pass `MergeTree` to `run_mergetool_external()`Martin von Zweigbergk committed 3 years ago54b9ecc
  24. tests: make test helper for snapshotting working copy return `MergedTree`Martin von Zweigbergk committed 3 years agoa7e5ea0
  25. working_copy: make `old_checkout` argument be `MergedTreeId`Martin von Zweigbergk committed 3 years ago1895a55
  26. working_copy: return `MergedTreeId` on snapshotMartin von Zweigbergk committed 3 years agoabf3853
  27. working_copy: enable storing multiple tree ids in state fileMartin von Zweigbergk committed 3 years ago88e9933
  28. merged_tree: teach tree builder to build multiple treesMartin von Zweigbergk committed 3 years ago49e32aa
  29. store: add function to look up `MergedTree` by `MergedTreeId`Martin von Zweigbergk committed 3 years ago1577b40
  30. merged_tree: add `entries()` for iterating over all entriesMartin von Zweigbergk committed 3 years ago2dd2e77
  31. merged_tree: make `id()` return a `MergedTreeId`Martin von Zweigbergk committed 3 years ago36674e8
  32. templates: reword signature placeholders to match descriptionYuya Nishihara committed 3 years agoa0ae09f
  33. templater: move empty signature placeholder to user templateYuya Nishihara committed 3 years agof422f13
  34. tests: add more tests for empty signatureYuya Nishihara committed 3 years agob45da80
  35. tests: do not use "author" template keyword to test string functionsYuya Nishihara committed 3 years ago88b509f

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t