Code

History

Commits on ig/commit-debug6160+
  1. git: remove redundant id.clone() from diff_refs_to_import()Yuya Nishihara committed 3 years ago359c871
  2. merge_tools: extract external merge tool functionsWaleed Khan committed 3 years agob837e88
  3. merge_tools: create `merge_tools` directoryWaleed Khan committed 3 years ago4bb40bb
  4. Allow editing user-specific config file outside of a repoPiotr Kufel committed 3 years agoa8b02de
  5. cli: add support for setting default descriptionVamsi Avula committed 3 years agobc57754
  6. docs: correct stale info about which backends are dynamically chosenMartin von Zweigbergk committed 3 years ago28182db
  7. cleanup: use `fs:read()` instead of `File::open().read_to_end()`Martin von Zweigbergk committed 3 years agoe414f3b
  8. cli: trim the description from editor before using itVamsi Avula committed 3 years agob8cc6fc
  9. conflicts: remove redundant `num_removes` argument from `parse_conflict()`Martin von Zweigbergk committed 3 years ago0b3b62a
  10. repo: micro-optimize add_head() to not instantiate indexed commit objectYuya Nishihara committed 3 years ago72271c0
  11. index: rewrite topological sort by leveraging dag_walk functionYuya Nishihara committed 3 years ago15fb8b9
  12. index: add tracing output to "jj debug reindex" pathYuya Nishihara committed 3 years ago8652bae
  13. cli: Allow repeated `-m` options for multi-paragraph descriptionsZachary Dremann committed 3 years ago062f7a2
  14. merge_tools: rename `MergeTool` -> `ExternalMergeTool`Waleed Khan committed 3 years agoc572c1a
  15. docs: disambiguate link to user config infoEmily Fox committed 3 years agoc2979e8
  16. docs: fix typo in operation-log.mdEmily Fox committed 3 years ago6245181
  17. docs: add `diff-instructions` to config schemaWaleed Khan committed 3 years ago4c7b4a8
  18. cli: indicate empty files in default diff formatMartin von Zweigbergk committed 3 years ago00d2d2d
  19. working_copy: return early from `write_path_to_store()` for non-filesMartin von Zweigbergk committed 3 years agof9e0fea
  20. working_copy: propagate errors when reading conflicted fileMartin von Zweigbergk committed 3 years ago23f54b8
  21. working_copy: reduce scope of a `content` variableMartin von Zweigbergk committed 3 years ago33a93b6
  22. working_copy: reduce scope of an `executable` variableMartin von Zweigbergk committed 3 years ago585c212
  23. working_copy: inline `write_conflict_to_store()`Martin von Zweigbergk committed 3 years ago2102de9
  24. cli: on "git clone --colocate", set up .git/info/exclude to ignore .jj dirYuya Nishihara committed 3 years agod57237a
  25. cli: move add_to_git_exclude() helper to commands.git moduleYuya Nishihara committed 3 years ago5c6ef75
  26. cli: discard "unborn" default branch before checking out fetched headYuya Nishihara committed 3 years ago8b5ff20
  27. cli: fix --no-pager to persist across layered config loadingYuya Nishihara committed 3 years ago28633bb
  28. windows: disable pagination by default (#2040)Martin von Zweigbergk committed 3 years ago1d4b5d0
  29. merge_tools: postpone writing conflict object a little longerMartin von Zweigbergk committed 3 years ago3b164c6
  30. conflicts: make `update_from_content()` write resolved content to storeMartin von Zweigbergk committed 3 years ago4c46398
  31. conflicts: make `update_from_content()` work with only `FileId`sMartin von Zweigbergk committed 3 years ago0b85f06
  32. tests: levarage the `materialize_conflict_string()` helper in more placesMartin von Zweigbergk committed 3 years ago94c14d4
  33. tree: inline `simplify_conflict()`Martin von Zweigbergk committed 3 years agoadf9679
  34. merged_tree: rename some symbols away from "conflict"Martin von Zweigbergk committed 3 years agod4e755b
  35. merge: move some methods back to `conflicts` as free functionsMartin von Zweigbergk committed 3 years agoa995c66

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