Code

History

Commits on ig/conflictsimp to cli/src35+
  1. cli config edit: Rollback to previous config when invalid TOML is savedThéo Daron committed 1 year ago3ab9e09
  2. completion: fix completion of arguments for aliases/default-command in bash and zshJonas Greitemann committed 1 year ago9289840
  3. templates: add self.trailers().contains_key(key)Gaëtan Lehmann committed 1 year ago2c4a032
  4. CliRunner: don't require hook functions to have static lifetimeMartin von Zweigbergk committed 1 year agob7489aa
  5. CliRunner: replace start hook by dispatch hookMartin von Zweigbergk committed 1 year ago4435fae
  6. templater: don't attribute method table functions as pubYuya Nishihara committed 1 year ago4f3e7e9
  7. merge-tools: builtin: refactor mapping of binary filesYuya Nishihara committed 1 year ago27a35a7
  8. templates: implement `Commit.trailers()`Mateus Auler committed 1 year ago968806b
  9. merge-tools: builtin: parse conflict hunks back to merge valueYuya Nishihara committed 1 year ago6e67d79
  10. merge-tools: builtin: split apply_diff_builtin() functionYuya Nishihara committed 1 year agoacb4e27
  11. merge-tools: builtin: leverage materialized_diff_stream()Yuya Nishihara committed 1 year agoa3dcd8b
  12. merge-tools: builtin: do not include unchanged entry in test diffs, sort pathsYuya Nishihara committed 1 year agobe37209
  13. merge-tools: builtin: extract wrapper functions in testsYuya Nishihara committed 1 year ago9c723a1
  14. git: tolerate unknown `git.fetch` remotes if others are availableJacob Hayes committed 1 year ago1cdd790
  15. cli: put editor-*.jjdescription file in /tmp instead of .jj/repo/Martin von Zweigbergk committed 1 year ago146900a
  16. config-schema: allow "command-env"-style for editors and fix toolsJonas Greitemann committed 1 year agobf2c01e
  17. config-schema: require both "command" and "env" keys in structured tool configJonas Greitemann committed 1 year agod35dd31
  18. config-schema: deny empty arrays for command-like config optionsJonas Greitemann committed 1 year ago4a1754b
  19. config-schema: schema wrongly allowed `ui.pager.command` to be a stringJonas Greitemann committed 1 year ago5444067
  20. config-schema: fix 2 default values which weren't booleans, but stringsJonas Greitemann committed 1 year agod4024e0
  21. config-schema: add missing default for `core.fsmonitor`Jonas Greitemann committed 1 year ago69cf7b3
  22. config-schema: fix wrong "default" for `ui.streampager.interface`Jonas Greitemann committed 1 year agob99361c
  23. config-schema: fix a typo in the `$comment` fieldJonas Greitemann committed 1 year ago47fba33
  24. cli: rebase: consolidate call sites of move_commits()Yuya Nishihara committed 1 year ago757a08c
  25. cli: rebase: remove redundant check for empty operationYuya Nishihara committed 1 year agofdaf8b9
  26. cli: rebase: use slice pattern when constructing tx descriptionsYuya Nishihara committed 1 year agobdedf4a
  27. cli: add config option for built-in pager's rulerSam committed 1 year ago001801a
  28. cli: evolog: rename variable to match the actual typeYuya Nishihara committed 1 year ago6e5f029
  29. cli: evolog: remove redundant Result wrappingYuya Nishihara committed 1 year ago853992f
  30. config: migrate ui.default-description to template aliasYuya Nishihara committed 1 year agoaf9c608
  31. annotate: reorganize functions as restartable processYuya Nishihara committed 1 year agofc5f90c
  32. revset: rename `StoreError` variants to `Backend`Martin von Zweigbergk committed 1 year agoed99e21
  33. squash: don't add trailers to an empty descriptionGaëtan Lehmann committed 1 year ago7073811
  34. templates: extract a template alias as hook for default commit descriptionMartin von Zweigbergk committed 1 year ago15351a2
  35. cli: git-push: do not move existing local bookmarks by --changeYuya Nishihara committed 1 year ago6cba6d7

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