1
1
mirror of https://github.com/kahole/edamagit.git synced 2024-09-11 07:15:31 +03:00
Commit Graph

733 Commits

Author SHA1 Message Date
Kristian Andersen Hole
b968cfda62 fixup! adds no verify to merge commit 2024-01-23 14:13:00 +01:00
Kristian Andersen Hole
7c9edfecd1 changelog 2024-01-23 13:50:03 +01:00
Kristian Andersen Hole
63c1ea1cd5 adds no verify to merge commit 2024-01-23 13:40:18 +01:00
Kristian Andersen Hole
cc51974ce9 changelog 2024-01-18 22:25:45 +01:00
Kristian Andersen Hole
12617656c6 adds no verify switch to merging commands 2024-01-18 22:23:52 +01:00
Kristian Andersen Hole
3f66cd1cb5 check cursor-word chooseRef is actually a commit, otherwise throw away 2024-01-18 22:23:06 +01:00
Kristian Andersen Hole
153b0d6751 adds git -c diff.noprefix=false to raw commands (adressing #276) 2024-01-18 22:21:26 +01:00
Kristian Andersen Hole
f026de4e19
Merge pull request #287 from ajmcmiddlin/patch-1
Update extensions.vim_tab entry in README.md.
2024-01-08 08:39:52 +01:00
Andrew
9b4639a5e9
Update extensions.vim_tab entry in README.md.
The keybindings for `extensions.vim_tab` did not work for me. The tab key didn't toggle folding of sections as expected. Removing the `when` field in the `-extensions.vim_tab` entry seemed to fix the problem for me.
2024-01-02 13:18:30 +10:00
Kristian Andersen Hole
4fff85a512 changelog 2023-12-29 13:35:53 +01:00
Kristian Andersen Hole
1e3efab596 fix commitDetail overwrite loss of control issue 2023-12-29 13:34:09 +01:00
Kristian Andersen Hole
7d575c50be changelog 2023-12-27 11:19:14 +01:00
Kristian Andersen Hole
d438b66fd8 fix "visit change" uris for commit and stash detail views 2023-12-27 11:17:56 +01:00
Kristian Andersen Hole
6d4125795e new logo 2023-12-09 19:10:04 +01:00
Kristian Andersen Hole
584a5eeee5 changelog 2023-12-09 15:48:10 +01:00
Kristian Andersen Hole
31bd62b4c0 make commit and stash detail view update on changes (fixes #282) 2023-12-09 15:48:10 +01:00
Kristian Andersen Hole
4d059d141f changelog 2023-12-04 17:16:24 +01:00
Kristian Andersen Hole
550083724f
Merge pull request #285 from bzy-debug/fix-233
Check all editors when computing viewColumn, so that one magit status buffer won't be open in different editors (@bzy-debug
Bao Zhiyuan)
2023-12-04 17:15:37 +01:00
Kristian Andersen Hole
0d17f57d62
Merge pull request #267 from ianic/fix-remote-insiders-path
fix vscode-insiders path for the remote environment
2023-12-04 17:10:49 +01:00
Kristian Andersen Hole
12e901b7cf
Merge pull request #284 from bzy-debug/cursor-commit-hash
feat: show commit hash under cursor when checkout
2023-12-04 17:06:01 +01:00
bzy-debug
154822599b add commit hash under curosr in chooseRef 2023-12-01 23:26:57 +08:00
bzy-debug
6532b4a1dc Check all editors when computing viewColumn 2023-12-01 23:23:26 +08:00
Kristian Andersen Hole
64cd537db2 changelog 2023-11-29 12:46:52 +01:00
Kristian Andersen Hole
d62043a2c3 adds context id to commit detail change section
To avoid conflict with status view folding states
2023-11-29 12:45:46 +01:00
Kristian Andersen Hole
8cecd1e443 changelog 2023-11-06 15:26:19 +01:00
Kristian Andersen Hole
0951c000e3 parse untracked paths as paths and not uris (fixes #281) 2023-11-06 15:23:36 +01:00
Kristian Andersen Hole
ebbd313532
Update README.md 2023-10-26 02:53:12 +02:00
Kristian Andersen Hole
16012c39ee changelog 2023-10-12 00:32:52 +02:00
Kristian Andersen Hole
a0c21e7fee Properly dispose "Running git" status bar messages
This fixes issue #279 meaning messages won't get stuck
in the status bar any longer.
This commit also disables status messages for magit status, to
reduce noise.
2023-10-12 00:30:59 +02:00
Kristian Andersen Hole
53d8f64ae1 changelog 2023-10-08 17:57:06 +02:00
Kristian Andersen Hole
e82f11094c update links to tutorial 2023-10-08 17:44:04 +02:00
Kristian Andersen Hole
8829229881
Merge pull request #278 from jdanbrown/more-move-commands
More move commands: section/change/hunk, unstaged/staged changes
2023-10-08 17:40:16 +02:00
Kristian Andersen Hole
fe1a861861
Update macros.ts 2023-10-08 17:34:02 +02:00
Kristian Andersen Hole
9a12bc3b15
Merge branch 'develop' into more-move-commands 2023-10-08 17:31:16 +02:00
Kristian Andersen Hole
7308619938
Merge pull request #271 from evannjohnson/conciseLogDecorate
Concise log decorate
2023-10-08 17:29:18 +02:00
Kristian Andersen Hole
9578299b88
Merge pull request #268 from Rutherther/feat/fold-commit-detail
Support fold/unfold diff hunks in commit detail view
2023-10-08 17:28:58 +02:00
Kristian Andersen Hole
284dd61a33
Merge pull request #277 from jdanbrown/add-toggle-all-folds-for-change-views
Add command toggle-all-folds-for-change-views
2023-10-08 17:28:37 +02:00
Kristian Andersen Hole
5c7676b472
Merge pull request #275 from Rutherther/feat/show-status
Show running git command in git status message
2023-10-08 17:28:13 +02:00
Dan Brown
8f45612161 More move commands: Section/Change/Hunk, Unstaged/Staged Changes 2023-10-03 15:59:37 -06:00
Dan Brown
2230d0d45e Add command toggle-all-folds-for-change-views 2023-09-30 15:40:00 -06:00
Kristian Andersen Hole
3e0cdf82d1 update vim keybindings in readme (#274) 2023-09-13 17:43:27 +02:00
František Boháček
d0d9da8219 Show status bar when running git 2023-09-12 22:52:14 +02:00
Evan Johnson
06d81d5cf9 get default branches on remotes when creating log view 2023-09-10 09:57:02 -06:00
Evan Johnson
6ea7fb5b74 use generateRefTokensLine in log view 2023-09-10 09:56:58 -06:00
Evan Johnson
086066aa7d add HEAD checking to generateRefTokensLine 2023-09-10 09:56:51 -06:00
Evan Johnson
8c231e46a1 add HEAD semantic token types 2023-09-10 09:55:55 -06:00
František Boháček
2ad5c22c74 Support fold/unfold diff hunks in commit detail view 2023-09-08 22:42:43 +02:00
Kristian Andersen Hole
6865a8c144 seeking maintainer 2023-08-10 11:15:26 +02:00
Igor Anić
b53993158a fix vscode-insiders path for the remote environment
I'm using vscode insiders from macOS to develop on remote Linux machine.
When I try to commit edamagit fails because it cannot find code
cli.

 'code-insiders' it is in PATH when running terminal from vscode:
```sh
which code-insiders
/home/ianic/.vscode-server-insiders/bin/9800cf6dd6bf4634889d60720ef46a400f3a7298/bin/remote-cli/code-insiders
```

The problem is that edamagit is looking into `../bin/code-insiders`
instead of `../bin/remote-cli/code-insiders`. So it fails to
find it and
[fallback](e9462afbda/src/commands/commitCommands.ts (L212))
to using `code` from PATH. Which works if insiders version is not used.
In insiders version there is no `code` cli in PATH but
`code-insiders`.

I think that [this](https://github.com/kahole/edamagit/issues/194) issue
has the same root cause.
2023-07-31 12:00:35 +02:00
kahole
e9462afbda changelog 2023-07-13 21:36:16 +02:00