History

Commits on ig/vimdiffwarn to cli2065+

`move.rs`: remove use of `MutRepo::create_descenant_rebaser`.Ilya Grigoriev committed 2 years ago6bfd090
cli: don't panic on empty alias substitutionYuya Nishihara committed 2 years ago6b862c6
repo: propagate store error from add_heads()Yuya Nishihara committed 2 years ago55b4f69
cli: warn if -R/--repository could be involved in command alias expansionYuya Nishihara committed 2 years ago1836a10
cli: use cwd-relative workspace config to resolve default command and aliasesYuya Nishihara committed 2 years ago30b5e88
cli: error out early if -R path is invalidYuya Nishihara committed 2 years ago941e538
cli: inline init_workspace_loader()Yuya Nishihara committed 2 years agoc82b2c7
cli: don't look for added/removed conflicts across old/new headsYuya Nishihara committed 2 years ago5bf9e41
document the use of JJ_USER and JJ_EMAIL in combination with --reset-authorGabriel Scherer committed 2 years agofad511a
cli `untrack --help`: mention that files need to be already be ignoredIlya Grigoriev committed 2 years agoc5f76d6
git: turn git.auto-local-branch off by defaultYuya Nishihara committed 2 years ago87a8238
tests: set git_settings.auto_local_branch where it mattersYuya Nishihara committed 2 years ago6971ec2
Implement a `rename` subcommand for the `branch` command.Essien Ita Essien committed 3 years ago35b8dad
cli: ensure default remote branch is imported by "git clone"Yuya Nishihara committed 3 years ago5a466ca
tests: deduplicate source repo setup in test_git_clone.rsYuya Nishihara committed 3 years ago0cb6a2f
cli: colorize inline "jj branch" command hintsYuya Nishihara committed 2 years ago15c3014
cli: remove weird line break from the "jj branch forget" hintYuya Nishihara committed 2 years ago40d18bb
index: extract as_composite() to trait methodYuya Nishihara committed 2 years ago72d9cd0
cargo: bump git2 to 0.18.1Yuya Nishihara committed 2 years agod420002
cli: simplify definition of workspaces in cmd_workspace_forget()Martin von Zweigbergk committed 2 years ago90e241c
cli: move a few transaction description variables laterMartin von Zweigbergk committed 2 years ago24b1421
transaction: take description at end instead of startMartin von Zweigbergk committed 2 years ago60fae31
cli `branch track`, `branch untrack`: document remote branches in `jj help`Ilya Grigoriev committed 2 years ago872a94d
index: move default_index_store.rs to sub directory named default_indexYuya Nishihara committed 2 years agocdcd465
cli: print a hint about how to resolve conflictsMartin von Zweigbergk committed 2 years agoa88b3dd
cli: print a message about new and resolved conflictsMartin von Zweigbergk committed 2 years ago2dae5f5
cli: print failed git export reason for each refYuya Nishihara committed 2 years agoa110ec6
index: rename ReadonlyIndexWrapper to DefaultReadonlyIndexYuya Nishihara committed 2 years ago6c57ba7
git: have export_refs() obtain git2::Repository instance from storeYuya Nishihara committed 3 years agoa77eed6
workspace: consider .git symlink when generating relative git_target pathYuya Nishihara committed 3 years ago25fcc3e
git_backend: don't fully canonicalize .git symlinkYuya Nishihara committed 2 years ago899c637
tests: add weirdly symlinked git repo to demonstrate "repo" tool issueYuya Nishihara committed 2 years ago32d3e24
tests: extract helper function that reads "git_target" fileYuya Nishihara committed 3 years agoacac2cd
merge_tools.toml: add a comment to `meld-3` definitionIlya Grigoriev committed 2 years ago1fd421f
gc: implement basic GC for Git backendMartin von Zweigbergk committed 2 years ago1cc2714