Code

History

Commits on ig/vimdiffwarn to cli1470+
  1. templater: add optional integer typeYuya Nishihara committed 2 years ago62decb7
  2. templater: add helper method that unwraps Option<T> propertyYuya Nishihara committed 2 years agoc2c160f
  3. templater: remove IntoTemplate abstraction, use extension method insteadYuya Nishihara committed 2 years ago04063a0
  4. cli `jj util completion --help`: Make the terminal output a bit prettierIlya Grigoriev committed 2 years ago2760b23
  5. config.md: advertise `diffedit3` as an alternative to `meld-3` diff editorIlya Grigoriev committed 2 years ago9be1593
  6. commit: add a helper for returning parent tree of `Commit`Martin von Zweigbergk committed 2 years agodbba2ed
  7. cleanup: consistently use `BackendResult`Martin von Zweigbergk committed 2 years ago428e209
  8. branching: merge v0.17.1 into mainMartin von Zweigbergk committed 2 years ago61e4e36
  9. cli: status: exclude working-copy commit from conflicts revset by ancestryYuya Nishihara committed 2 years ago0a5c98d
  10. cli: status: evaluate conflicts revset as a user expressionYuya Nishihara committed 2 years agoc1d934a
  11. cleanup: rustfmt cli/src/commands/status.rsYuya Nishihara committed 2 years ago76b6d03
  12. cli: status: only scan through mutable changes to find conflictsEric Roshan-Eisner committed 2 years agob67e198
  13. revset: support custom filter extensionsdploch committed 2 years ago20af8c7
  14. revset: support defining custom revset functionsdploch committed 2 years ago387ae9b
  15. revset: make RevsetParseContext opaquedploch committed 2 years ago4e0abf0
  16. conflicts.rs: label conflict number and sides next to conflict markersIlya Grigoriev committed 2 years ago70b517c
  17. test_resolve_command: use `diff --git` for readabilityIlya Grigoriev committed 2 years ago2f48f76
  18. External merge tools: better error message for unsupported usageIlya Grigoriev committed 2 years ago04158c3
  19. cli: move `revsets.log` default to config fileMartin von Zweigbergk committed 2 years ago3dab92d
  20. cli: show hint for inner fileset/revset/template errorsYuya Nishihara committed 2 years agof1fd1d8
  21. cli: extract functions that map fileset/revset/template errors to hintsYuya Nishihara committed 2 years ago34fce3c
  22. cli `--ignore-immutable` help: remove double negativeIlya Grigoriev committed 2 years ago5322c1d
  23. docs: update obslog descriptionCharles Crete committed 2 years ago4b215a3
  24. docs: mention origin of obslog nameCharles Crete committed 2 years agoc1de6ea
  25. cli: show commit summary in "tag list"Yuya Nishihara committed 2 years ago0d630ac
  26. templater: expose RefTarget methods through RefName typeYuya Nishihara committed 2 years ago4db068e
  27. cli: colorize tag name in "tag list" outputYuya Nishihara committed 2 years ago520b4db
  28. cli: migrate "tag list" to templateYuya Nishihara committed 2 years ago1ce3e9f
  29. tests: simplify local repo setup in test_tag_list()Yuya Nishihara committed 2 years agod1458b5
  30. templater: add RefName::local_only() constructorYuya Nishihara committed 2 years ago8abcbd6
  31. templater: store associated RefTarget in RefName structYuya Nishihara committed 2 years ago35e550e
  32. cli: status: when current change has conflicts, display instructions to resolve themAlexis (Poliorcetics) Bourget committed 2 years ago52e494d
  33. merged_tree: propagate errors from `TreeEntriesIterator`Martin von Zweigbergk committed 2 years ago0d1ff8a
  34. squash: don't use unchanged source commit as predecessorMartin von Zweigbergk committed 2 years ago7093d5d
  35. squash: don't rewrite commits that didn't changeMartin von Zweigbergk committed 2 years ago09b9605