Code

History

Commits on ig/commit-debug to cli/tests1120+
  1. cli: deprecate `-l` short alias for `--limit` in favour of `-n`Manuel Caldeira committed 2 years ago72438fc
  2. merge_tools: simplify file conflicts before attempting to resolveBenjamin Tan committed 2 years ago7c9f28a
  3. test_resolve_command: accept filename in `check_resolve_produces_input_file`Benjamin Tan committed 2 years ago17c8daa
  4. print_conflicted_paths: simplify file conflicts before printingBenjamin Tan committed 2 years ago9d4ac81
  5. conflicts: materialize simplified file conflictsBenjamin Tan committed 2 years ago9be3372
  6. tests: add tests showing that individual file conflicts are not simplified/deduplicatedBenjamin Tan committed 2 years agof74991c
  7. revset, templater: implement arity-based alias overloadingYuya Nishihara committed 2 years agoa7bff04
  8. revset, templater: include parameter names in AliasIdYuya Nishihara committed 2 years agod38c9e8
  9. cli `fix`: change default from `-s @` to `-s 'reachable(@, mutable())'`Danny Hooper committed 2 years ago986630b
  10. cli `fix`: add `revsets.fix` config for default revset to be fixedDanny Hooper committed 2 years agofaf9a9d
  11. fix: add support for fixing only some pathsMartin von Zweigbergk committed 2 years ago78cbb51
  12. Show paths of config files when configurations contain errorsSimon Wollwage committed 2 years ago3cd1fe4
  13. merged_tree: make tree builder attempt to resolve conflictsMartin von Zweigbergk committed 2 years ago65a988e
  14. revset: represent program modifier as AST nodeYuya Nishihara committed 2 years agoeda7069
  15. cli: add --allow-empty-description flag to pushMichael Gattozzi committed 2 years ago3bc361a
  16. new: allow `--insert-before` and `--insert-after` simultaneouslyBenjamin Tan committed 2 years agoa3c6a9b
  17. new: convert `--insert-before` and `--insert-after` into proper optionsBenjamin Tan committed 2 years ago256a51f
  18. new: refactor creation of new commit into common code pathBenjamin Tan committed 2 years agof74618f
  19. revset: omit function name from type error messagesYuya Nishihara committed 2 years ago14421ac
  20. cli: implement enough of `jj fix` to run a single tool on all filesDanny Hooper committed 2 years ago3050685
  21. `jj help git`: Include "Git remotes" in the titleIlya Grigoriev committed 2 years ago441175f
  22. cli `git push`: clearer user-facing messagesIlya Grigoriev committed 2 years agob1e5ca5
  23. docs and `jj help`: hide deprecated `jj move`Ilya Grigoriev committed 2 years agoab19533
  24. revset: split AST-level parsing and expression lowering stagesYuya Nishihara committed 2 years ago89ac3a1
  25. `jj git push` docs: document safety checksIlya Grigoriev committed 2 years agoa30df32
  26. git: unset unborn HEAD ref on exportYuya Nishihara committed 2 years ago5e7cb34
  27. tests: use get_log_output() helper in test_git_init.rsYuya Nishihara committed 2 years ago00ae860
  28. backend: add error variant for access denied, handle when diffingMartin von Zweigbergk committed 2 years ago404f31c
  29. cat: slightly change warning message about non-file pathsMartin von Zweigbergk committed 2 years agofccba76
  30. repo: when abandoning a working copy that a merge, recreate itMartin von Zweigbergk committed 2 years agoe02622b
  31. test_git_push: test unexpectedly deleted branchIlya Grigoriev committed 2 years ago77ad668
  32. jj git push: safety checks in push negotiation, "force-with-lease"Ilya Grigoriev committed 2 years ago8d3dd17
  33. test_git_push: add a test for creating unexpectedly existing branchIlya Grigoriev committed 2 years ago1e1507d
  34. test_git_push: demo behavior we'd like to be saferIlya Grigoriev committed 2 years ago221cd44
  35. conflicts: consider the empty tree a non-legacy treeMartin von Zweigbergk committed 2 years ago7e6a968

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