Code

History

Commits on ig/vimdiffwarn to cli/src2100+
  1. templater: add `root` keywordAnton Bulakh committed 3 years ago82923af
  2. cleanup: fix warnings from nightly clippyMartin von Zweigbergk committed 3 years agof1b817e
  3. cli: leverage `Merge::map()` in `jj chmod`Martin von Zweigbergk committed 3 years ago9a2a8f8
  4. cli: in `jj chmod`, check if all sides are files firstMartin von Zweigbergk committed 3 years ago725f79c
  5. cli: say that `jj chmod` errors out if there are any non-file sidesMartin von Zweigbergk committed 3 years agoa80259c
  6. add error message when running from a non-existent directoryTal Pressman committed 3 years ago32fef36
  7. cli: include hint when push is not fast-forwardMartin von Zweigbergk committed 3 years agoaf145e8
  8. merge_tools: move symbols to `external.rs`Waleed Khan committed 3 years ago9ea9c06
  9. merge_tools: extract external merge tool functionsWaleed Khan committed 3 years agob837e88
  10. merge_tools: create `merge_tools` directoryWaleed Khan committed 3 years ago4bb40bb
  11. Allow editing user-specific config file outside of a repoPiotr Kufel committed 3 years agoa8b02de
  12. cli: add support for setting default descriptionVamsi Avula committed 3 years agobc57754
  13. cli: trim the description from editor before using itVamsi Avula committed 3 years agob8cc6fc
  14. cli: Allow repeated `-m` options for multi-paragraph descriptionsZachary Dremann committed 3 years ago062f7a2
  15. merge_tools: rename `MergeTool` -> `ExternalMergeTool`Waleed Khan committed 3 years agoc572c1a
  16. docs: add `diff-instructions` to config schemaWaleed Khan committed 3 years ago4c7b4a8
  17. cli: indicate empty files in default diff formatMartin von Zweigbergk committed 3 years ago00d2d2d
  18. cli: on "git clone --colocate", set up .git/info/exclude to ignore .jj dirYuya Nishihara committed 3 years agod57237a
  19. cli: move add_to_git_exclude() helper to commands.git moduleYuya Nishihara committed 3 years ago5c6ef75
  20. cli: discard "unborn" default branch before checking out fetched headYuya Nishihara committed 3 years ago8b5ff20
  21. cli: fix --no-pager to persist across layered config loadingYuya Nishihara committed 3 years ago28633bb
  22. windows: disable pagination by default (#2040)Martin von Zweigbergk committed 3 years ago1d4b5d0
  23. merge_tools: postpone writing conflict object a little longerMartin von Zweigbergk committed 3 years ago3b164c6
  24. conflicts: make `update_from_content()` write resolved content to storeMartin von Zweigbergk committed 3 years ago4c46398
  25. conflicts: make `update_from_content()` work with only `FileId`sMartin von Zweigbergk committed 3 years ago0b85f06
  26. merge: move some methods back to `conflicts` as free functionsMartin von Zweigbergk committed 3 years agoa995c66
  27. Update docs and errors to use XDG config pathBen Saunders committed 3 years agoe563d60
  28. configs: add the ability to disable paging via `ui.paginate`Matt Stavola committed 3 years ago4760b56
  29. git: propagate errors for missing commits when importing refsMartin von Zweigbergk committed 3 years agod1dbe6d
  30. cli: attach stderr stream of external diff command to pagerYuya Nishihara committed 3 years ago0cbee40
  31. cli: show warning if external diff generator exited with non-zero statusYuya Nishihara committed 3 years ago4c9c923
  32. cli: pass ui in to merge_tools::generate_diff()Yuya Nishihara committed 3 years ago9dbadda
  33. cli templates: include branches in short commit descriptionIlya Grigoriev committed 3 years ago6fa8a25
  34. cli `branch list`: use separate short commit templateIlya Grigoriev committed 3 years ago355b93f
  35. cli: add "--limit N" option to log-like commandsYuya Nishihara committed 3 years ago17b45d6