Code

History

Commits on ig/commit-debug to cli3185+
  1. merge_tools: move symbols to `external.rs`Waleed Khan committed 3 years ago9ea9c06
  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. cli: trim the description from editor before using itVamsi Avula committed 3 years agob8cc6fc
  7. cli: Allow repeated `-m` options for multi-paragraph descriptionsZachary Dremann committed 3 years ago062f7a2
  8. merge_tools: rename `MergeTool` -> `ExternalMergeTool`Waleed Khan committed 3 years agoc572c1a
  9. docs: add `diff-instructions` to config schemaWaleed Khan committed 3 years ago4c7b4a8
  10. cli: indicate empty files in default diff formatMartin von Zweigbergk committed 3 years ago00d2d2d
  11. cli: on "git clone --colocate", set up .git/info/exclude to ignore .jj dirYuya Nishihara committed 3 years agod57237a
  12. cli: move add_to_git_exclude() helper to commands.git moduleYuya Nishihara committed 3 years ago5c6ef75
  13. cli: discard "unborn" default branch before checking out fetched headYuya Nishihara committed 3 years ago8b5ff20
  14. cli: fix --no-pager to persist across layered config loadingYuya Nishihara committed 3 years ago28633bb
  15. windows: disable pagination by default (#2040)Martin von Zweigbergk committed 3 years ago1d4b5d0
  16. merge_tools: postpone writing conflict object a little longerMartin von Zweigbergk committed 3 years ago3b164c6
  17. conflicts: make `update_from_content()` write resolved content to storeMartin von Zweigbergk committed 3 years ago4c46398
  18. conflicts: make `update_from_content()` work with only `FileId`sMartin von Zweigbergk committed 3 years ago0b85f06
  19. merge: move some methods back to `conflicts` as free functionsMartin von Zweigbergk committed 3 years agoa995c66
  20. Update docs and errors to use XDG config pathBen Saunders committed 3 years agoe563d60
  21. configs: add the ability to disable paging via `ui.paginate`Matt Stavola committed 3 years ago4760b56
  22. git: propagate errors for missing commits when importing refsMartin von Zweigbergk committed 3 years agod1dbe6d
  23. cli: attach stderr stream of external diff command to pagerYuya Nishihara committed 3 years ago0cbee40
  24. cli: show warning if external diff generator exited with non-zero statusYuya Nishihara committed 3 years ago4c9c923
  25. cli: pass ui in to merge_tools::generate_diff()Yuya Nishihara committed 3 years ago9dbadda
  26. cli templates: include branches in short commit descriptionIlya Grigoriev committed 3 years ago6fa8a25
  27. cli `branch list`: use separate short commit templateIlya Grigoriev committed 3 years ago355b93f
  28. cli: add "--limit N" option to log-like commandsYuya Nishihara committed 3 years ago17b45d6
  29. cli: handle invalid ui.editor configurationYuya Nishihara committed 3 years agofb41ef4
  30. configs: use Notepad as default editor on WindowsMartin von Zweigbergk committed 3 years agoa367f13
  31. cli: move default editor (`pico`) definition to config fileMartin von Zweigbergk committed 3 years ago32b07d6
  32. cli: detect .git symlink as a colocated workspaceYuya Nishihara committed 3 years agob2101d1
  33. cli: do not panic if clone destination directory can't be createdYuya Nishihara committed 3 years ago900300c
  34. cli: clean up .git directory if "jj git clone --colocate" failedYuya Nishihara committed 3 years ago97b6eb2
  35. cli: send "Failed to clean up" message to stderrYuya Nishihara committed 3 years ago6625e91