Code

History

Commits on ig/vimdiffwarn to cli/src1890+
  1. merged_tree: propagate backend errors in diff iteratorMartin von Zweigbergk committed 3 years agoa1ef9dc
  2. merge: introduce a type alias for `Merge<Option<TreeValue>>`Martin von Zweigbergk committed 3 years ago309f120
  3. cli: add string pattern support to "git push --branch"Yuya Nishihara committed 3 years ago1bfe5b5
  4. merge_tools.toml: add VS Code as a default merge tool.Ilya Grigoriev committed 3 years agofcd02a6
  5. cli templates: include hidden (AKA abandoned) status in short commit templateIlya Grigoriev committed 3 years ago5e40798
  6. git: simply call fetch() with one or more branch name filtersYuya Nishihara committed 3 years agoa6ac9b4
  7. cli: parse "git fetch --branch" parameter as string patternYuya Nishihara committed 3 years ago560b635
  8. cli: move parse_name_pattern() to cli_util, rename the functionYuya Nishihara committed 3 years ago09529b6
  9. cli: add a `jj debug tree` command for printing the treeMartin von Zweigbergk committed 3 years agodaa2317
  10. cli: show stats if multiple branches are tracked/untrackedYuya Nishihara committed 3 years agobaef7f1
  11. cli: allow to select branches to track/untrack by string patternYuya Nishihara committed 3 years agod7f504c
  12. cli: do not error out on re-track/untrack, show warning insteadYuya Nishihara committed 3 years agod43704c
  13. cli: deprecate branch delete/forget --glob option in favor of glob: syntaxYuya Nishihara committed 3 years ago8dbe12d
  14. cli: add kind:pattern syntax to branch delete/forget commandsYuya Nishihara committed 3 years agoc3f167e
  15. cli: restore fast path to look up local branch by exact patternYuya Nishihara committed 3 years ago65c033e
  16. cli: use StringPattern to find branches to delete/forgetYuya Nishihara committed 3 years agoeb2f278
  17. str_util: extract StringPattern from revset moduleYuya Nishihara committed 3 years ago5707a19
  18. conflicts: make materialization asyncMartin von Zweigbergk committed 3 years ago8764ad9
  19. cli: do not list non-tracking remote branches by defaultYuya Nishihara committed 3 years agod92be66
  20. cli: add "branch list --all" option to include all remote branchesYuya Nishihara committed 3 years ago12b879d
  21. git: add `.jj/.gitignore` when creating colocated repoMartin von Zweigbergk committed 3 years ago872265a
  22. templater: take non-tracking remote branches as unrelated to local branchYuya Nishihara committed 3 years agobcf159c
  23. cli: show hints for branches rejected to pushYuya Nishihara committed 3 years agoeb78ae9
  24. refs: error out push if non-tracking remote branches existYuya Nishihara committed 3 years ago9e0b9e6
  25. refs: classify push action based on tracking targetYuya Nishihara committed 3 years ago089503a
  26. view: make local/remote branches iterator yield RemoteRef instead of RefTargetYuya Nishihara committed 3 years ago30fb799
  27. git: on push, update jj's view of remote branches without using import_refs()Yuya Nishihara committed 3 years agoe0965c4
  28. git: extract push function that processes branches instead of git refsYuya Nishihara committed 3 years ago58897d7
  29. workspace: make working-copy type customizableMartin von Zweigbergk committed 3 years agoc3b45b6
  30. workspace: load working copy implementation dynamicallyMartin von Zweigbergk committed 3 years ago6bfd618
  31. working copy: pass commit instead of tree into `check_out()`Martin von Zweigbergk committed 3 years agoe1f00d9
  32. cli: pass remote_name to "git clone" helper as argumentYuya Nishihara committed 3 years ago940e243
  33. cli: remove redundant workaround for unborn branch on "git clone --colocate"Yuya Nishihara committed 3 years ago46e0303
  34. cli: add API and branch subcommand to track/untrack remote branchesYuya Nishihara committed 3 years ago9cafff8
  35. cli: list non-tracking remote branch as standalone entryYuya Nishihara committed 3 years agof74d793