Code

History

Commits on ig/commit-debug8120+
  1. Add a default merge tool config for `meld`, `vimdiff`, `kdiff3`.Ilya Grigoriev committed 4 years agoe3fd499
  2. `jj resolve`: option to parse conflict markers + testsIlya Grigoriev committed 4 years agod6c1b0b
  3. Test basic `jj resolve` functionalityIlya Grigoriev committed 3 years ago3e86baa
  4. Make `fake-editor` error output even more verboseIlya Grigoriev committed 3 years agoc2a4198
  5. `jj resolve`: error when merge tool args are not configuredIlya Grigoriev committed 3 years agoaeeae0a
  6. Make the choice and arguments of mergetool configurableIlya Grigoriev committed 4 years ago1eccd34
  7. New `jj resolve` command to resolve conflictsIlya Grigoriev committed 4 years ago1158600
  8. Rename `FileConflictData` to `ConflictHunk`, use it in `files.rs`.Ilya Grigoriev committed 4 years ago55762e3
  9. Expose functions useful for conflict resolution UIIlya Grigoriev committed 4 years ago85b472b
  10. git: inline `export_changes()`Martin von Zweigbergk committed 3 years agob3fe523
  11. git: on export, use repo view's `git_refs` as record of old export stateMartin von Zweigbergk committed 3 years ago8a440d8
  12. git: when exporting, don't overwrite changes made by gitMartin von Zweigbergk committed 3 years ago3979236
  13. changelog: list fix for #493 was a bugfix, not a featureMartin von Zweigbergk committed 3 years agoa98ed62
  14. git: add test for concurrent change in git repo between exportsMartin von Zweigbergk committed 3 years ago9b59461
  15. local_backend: switch from Thrift back to ProtobufMartin von Zweigbergk committed 3 years ago25008b6
  16. docs: describe how we do code reviewsMartin von Zweigbergk committed 3 years ago69f85df
  17. cli: accept command arguments specified by arrayYuya Nishihara committed 3 years agode639c3
  18. cli: split pager arguments like ui.editorYuya Nishihara committed 3 years ago3b5edd4
  19. cli: add helper function that makes Command builder from CommandArgsYuya Nishihara committed 3 years agof23302b
  20. cli: add wrapper struct for command arguments read from configYuya Nishihara committed 3 years ago368aa06
  21. github: new attempt at auto-enabling merge of Dependabot PRsMartin von Zweigbergk committed 3 years agoee7e7e1
  22. view: test that merging divergent rewrites results in both commits visibleMartin von Zweigbergk committed 4 years agob80c39d
  23. git: do not delete or track git submodules.Pranay Sashank committed 3 years ago47067c1
  24. cli: colorize pager spawn errorYuya Nishihara committed 3 years ago34fe089
  25. cli: add missing newline to pager error messagesYuya Nishihara committed 3 years ago74084d0
  26. readme: add some badgesMartin von Zweigbergk committed 3 years ago79267b5
  27. cli: correct and clarify rebase help textMartin von Zweigbergk committed 3 years agof30a922
  28. revset: inline ChildrenRevsetIterator by using .filter()Yuya Nishihara committed 3 years ago5cc99b6
  29. revset: inline FilterRevsetIterator by using .filter()Yuya Nishihara committed 3 years agofae3822
  30. revset: inline RevWalkRevsetIterator which is just an identity iteratorYuya Nishihara committed 3 years ago5b13c0b
  31. Miscellaneous improvements to config docsIlya Grigoriev committed 4 years ago52fadc0
  32. docs: clarify diff editor interfaceBenjamin Saunders committed 3 years agoce0aa95
  33. cli: add --no-pagerGlen Choo committed 4 years ago0df5f7c
  34. ui: add pagerGlen Choo committed 4 years ago7c2400f
  35. settings: move cli-specific settings to src/ui.rsGlen Choo committed 4 years agof4f0fbb

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