Code

History

Commits on ig/vimdiffwarn to cli1505+
  1. squash: move updating of source commits out of diff-editing loopMartin von Zweigbergk committed 2 years ago2bd2358
  2. squash: decide to abandon source commit if entire diff was selectedMartin von Zweigbergk committed 2 years ago7319479
  3. squash: add more tests of no-op squashingMartin von Zweigbergk committed 2 years ago8c2c319
  4. rebase: do not print out commit summaries of skipped commitsBenjamin Tan committed 2 years agof1f8454
  5. template: add contained_in method to commit object in templates this allows to conditionally display or label elements depending on whether the given commit is contained within the revsetNoah Mayr committed 2 years agodc693e7
  6. rebase: allow both `--insert-after` and `--insert-before` options to be used simultaneouslyBenjamin Tan committed 2 years ago0e2e09a
  7. rebase: add `--insert-after` and `--insert-before` options for `--revisions`Benjamin Tan committed 2 years agof75461e
  8. rebase: add `move_commits` function to perform rebasingBenjamin Tan committed 2 years ago714bc0a
  9. squash: add test that immutable commits are respected for `--from/--into`Martin von Zweigbergk committed 2 years ago492dd99
  10. tests: avoid a use of deprecated `jj move`Martin von Zweigbergk committed 2 years ago9503179
  11. rebase: allow `-r` to accept multiple revisionsBenjamin Tan committed 2 years ago6752402
  12. revset: add a SymbolResolverExtension trait to provide custom resolversdploch committed 2 years ago586ab1f
  13. examples: simplify commit templater example with Defaultdploch committed 2 years ago0cef90f
  14. revset: convert commit and change prefix resolvers into partial symbol resolversdploch committed 2 years agobad9e9e
  15. revset: add two new error variants to support extensionsdploch committed 2 years agocf78532
  16. cli: add global `--ignore-immutable`Martin von Zweigbergk committed 2 years agod13be92
  17. templates: remove implicit self dependency from description_placeholder aliasYuya Nishihara committed 2 years agoc267f55
  18. templates: extract common parts from commit_summary templatesYuya Nishihara committed 2 years agodbc7ad2
  19. templates: reimplement builtin_change_id_with_hidden_and_divergent_info aliasYuya Nishihara committed 2 years ago2bd6983
  20. templater: include actual type name in error messagesYuya Nishihara committed 2 years agoa63dbcc
  21. templater: add type_name() method to tagged property typesYuya Nishihara committed 2 years ago5394f34
  22. fileset, revset, templater: add support for single-quoted raw string literalsYuya Nishihara committed 2 years ago5b769c5
  23. Fixes typo in 'jj git init' argsRowan Walsh committed 2 years agof185a83
  24. fileset: fall back to bare pattern/string if no operator-like character foundYuya Nishihara committed 2 years ago528ccb3
  25. git_backend: add a README to conflicted commitsMartin von Zweigbergk committed 2 years ago9d7ed54
  26. rebase: do not simplify ancestor mergesBenjamin Tan committed 2 years agoe14ee8b
  27. rebase: modify tests to avoid a future ancestor merge with root commitBenjamin Tan committed 2 years ago3ee35e7
  28. rebase: rewrite `rebase_revision` to use `transform_descendants`Benjamin Tan committed 2 years agofb7c91f
  29. Simplify calls to `CommitRewriter::replace_parents()`Evan Mesterhazy committed 2 years agof9a3021
  30. cli: Clean up template to use `coalesce` where relevant.Anton Älgmyr committed 2 years ago484097c
  31. Add short a `-e` alias for `--edit` to prev and nextEvan Mesterhazy committed 2 years agoa2c49ab
  32. Rewrite rebasing in `jj split` using `transform_descendants()`Evan Mesterhazy committed 2 years agoe0c53bc
  33. Add checks for stderr and stdout to `jj split` testsEvan Mesterhazy committed 2 years ago6d28843
  34. Implement advance-branches for jj newEvan Mesterhazy committed 2 years ago0fb582e
  35. Allow advance_branches tests to be parameterizedEvan Mesterhazy committed 2 years ago3f0e4de