Code

History

Commits on ig/vimdiffwarn to cli/src1960+
  1. cli: describe what workspaces are in `jj workspace` helpMartin von Zweigbergk committed 3 years ago4d24028
  2. working_copy: don't crash when updating and tracked file exits on diskMartin von Zweigbergk committed 3 years ago44eb902
  3. cli: in colocated repo, don't restore view.git_head on undoYuya Nishihara committed 3 years agoaea135c
  4. working_copy: rename to local_working_copyMartin von Zweigbergk committed 3 years ago187ba94
  5. cli: rephrase @git branch with no local counterpart as "deleted"Yuya Nishihara committed 3 years ago1eb8b95
  6. cli: filter out branches to list without cloning the mapYuya Nishihara committed 3 years ago28e5ee3
  7. git: look up "git" remote branches normallyYuya Nishihara committed 3 years agod0bc34e
  8. cli: enable tree-level conflicts by defaultMartin von Zweigbergk committed 3 years ago2ccb17b
  9. cli: inline export_head_to_git(), use the same wc_commit to update working copyYuya Nishihara committed 3 years agobe3d588
  10. cli: reorder working-copy commit lookup bits in finish_transaction()Yuya Nishihara committed 3 years agodf71688
  11. git: extract function that resets Git HEADYuya Nishihara committed 3 years ago7ccbc04
  12. git_backend: rename git_repo_clone() as it isn't just cloning, propagate errorYuya Nishihara committed 3 years ago7c96cea
  13. git_backend: rewrite remaining git_repo() callers, make it privateYuya Nishihara committed 3 years ago837dc4f
  14. git_backend: proxy git2::Repository methods to manage lock scope internallyYuya Nishihara committed 3 years ago0d63223
  15. cli: don't list commits abandoned by import/fetch, just print the numberYuya Nishihara committed 3 years ago902a43a
  16. cli_utils: fix a typo in a commentMartin von Zweigbergk committed 3 years ago5947387
  17. cli: ensure first new HEAD is detachedYuya Nishihara committed 3 years ago0fe2557
  18. cli: add context to checkout/abandon messages triggered by automated git importYuya Nishihara committed 3 years ago480efc1
  19. cli: print commits abandoned by git::import_refs() or fetch()Yuya Nishihara committed 3 years ago8579bc4
  20. cli: return early if git::import_some_refs() is noopYuya Nishihara committed 3 years agofb08e16
  21. git: make import_refs() return abandoned commits to callerYuya Nishihara committed 3 years ago16d3bcd
  22. cli: redefine default log revset using `immutable_heads()`Martin von Zweigbergk committed 3 years ago58de7c2
  23. cli: report error on bad short-prefixes revsetMartin von Zweigbergk committed 3 years ago8ec402f
  24. command: add `--interactive` flag to `jj commit`Waleed Khan committed 3 years agod58664d
  25. commands: support path arguments to `jj commit`Waleed Khan committed 3 years ago946a6e0
  26. commands: add `--interactive` flag to `jj split`Waleed Khan committed 3 years agod91dcc0
  27. view: add method that iterates remote branches onlyYuya Nishihara committed 3 years agof0f1d72
  28. view: extract method that iterates local branches onlyYuya Nishihara committed 3 years agoc5474ff
  29. files: take `Merge` argument to `merge()`Martin von Zweigbergk committed 3 years agoaf80e4e
  30. templater: fast-path `empty` and `conflict` to not read treesMartin von Zweigbergk committed 3 years agoe50f6ac
  31. cli: make set of immutable commits configurableMartin von Zweigbergk committed 3 years agoa6ef3f0
  32. cli: make `check_rewritable()` accept multiple commitsMartin von Zweigbergk committed 3 years agoab85b9e
  33. cli: `jj duplicate` should refuse to duplicate only the root commitMartin von Zweigbergk committed 3 years ago3fbfd17
  34. merge_tools: pass `Matcher` in for interactive useWaleed Khan committed 3 years ago642ac8c
  35. cli: hint for same change idsWillian Mori committed 3 years ago4894636