Code

History

Commits on ig/vimdiffwarn to cli/src/config35+
  1. cli: warn on startup for vimdiff used as a diff editorIlya Grigoriev committed 1 year ago5ca7dca
  2. cli: make description template insert blank line if old description was emptyYuya Nishihara committed 1 year agofd05b6f
  3. cli: add revsets.log-graph-prioritize settingJakob Hellermann committed 1 year ago68ef93e
  4. vimdiff merge tool: automatically navigate to first conflictIlya Grigoriev committed 1 year ago1dedd9c
  5. vimdiff merge tool: use the default conflict markersIlya Grigoriev committed 1 year ago9d84747
  6. templates: create `builtin_draft_commit_description` templateCaleb White committed 1 year agocaf172f
  7. cli: add revert commandBenjamin Tan committed 1 year ago8a816b2
  8. templates: do not apply "overridden" label twice to detailed config listYuya Nishihara committed 1 year agof8082a0
  9. templates: rename inner "config list" helper to format_*()Yuya Nishihara committed 1 year agod9c5844
  10. templates: expose `format_short_signature_oneline` template alias hookJakob Hellermann committed 1 year ago1f751e2
  11. cli: config list: show origin of config valuesCaleb White committed 1 year ago67e17d5
  12. cli: emit warning for deprecated diff.format, move default to config/misc.tomlYuya Nishihara committed 1 year agodcf4771
  13. git: plumbing to report unimportable refs, warn non-utf-8 namesYuya Nishihara committed 3 years agocc1b716
  14. revset, templater: remove deprecated "branches" aliasesYuya Nishihara committed 1 year ago5486887
  15. cli: remove `unsquash` subcommandGeorge Christou committed 1 year ago5eb3c5b
  16. config: Allow hiding the 'how to resolve conflicts' hintJonathan Gilchrist committed 1 year ago742bc8a
  17. debug init-local: remove the `ui.allow-init-native` optionIlya Grigoriev committed 1 year ago1449c2d
  18. cli split: Disable the new bookmark behavior for `jj split`Evan Mesterhazy committed 1 year ago2af5b60
  19. sign: add default revisions for `jj sign`pylbrecht committed 1 year agoc90f0b9
  20. cli: add support for Sublime MergeGeorge Christou committed 1 year agof77e643
  21. cli: add mergiraf to the default merge tools configStephan Hügel committed 1 year agofececd9
  22. templates: add hook points for users to customize the default operation idAlain Leufroy committed 1 year agofa3254b
  23. cli split: Move bookmarks to the first commit instead of the secondEvan Mesterhazy committed 1 year agoa4b064e
  24. templater: port annotation line content to templateYuya Nishihara committed 1 year ago4ec22dd
  25. annotate: make AnnotationLine template typeBryce Berger committed 1 year ago3bc111e
  26. cli: backout: add `templates.backout_description` configurationBenjamin Tan committed 2 years agoe021036
  27. cli: add difftastic as diff toolMartin von Zweigbergk committed 1 year agof291ac4
  28. cli: sort tools in merge_tools.tomlMartin von Zweigbergk committed 1 year ago7b1820a
  29. cli: remove `ui.allow-filesets` configuration optionBenjamin Tan committed 1 year ago07c63ed
  30. built-in pager: allow configuring streampager optionsIlya Grigoriev committed 1 year agof60014f
  31. cli: port "file list" to templateYuya Nishihara committed 1 year ago8eebac5
  32. cli: reformat config/templates.tomlYuya Nishihara committed 1 year agoce3100a
  33. templates: add cryptographic_signature display to default formatsBryce Berger committed 1 year agof743165
  34. cli: add "git.push-new-bookmarks" config knob to enable --allow-new by defaultYuya Nishihara committed 1 year agof9906dc
  35. cli: git: define default "git.private-commits" in config/misc.tomlYuya Nishihara committed 1 year agod0f44e8