README-bot
6c0b805137
Updated README.md
2023-02-25 00:45:44 +00:00
Jesse Duffield
8a69d994c0
Merge pull request #2474 from jesseduffield/improve-staging-tests
2023-02-25 11:45:29 +11:00
Jesse Duffield
037e957282
fix PullMergeConflict integration test
2023-02-25 11:39:24 +11:00
Jesse Duffield
db011d8e34
Improve staging panel integration tests
2023-02-25 11:35:41 +11:00
Jesse Duffield
752526c880
Merge pull request #2470 from jesseduffield/migrate-staging-tests
2023-02-23 22:38:01 +11:00
Jesse Duffield
c63fed2074
migrate staging tests
2023-02-23 22:29:40 +11:00
Jesse Duffield
1b52a0d83f
Merge pull request #2463 from Ryooooooga/bump-tcell
2023-02-23 20:20:31 +11:00
Jesse Duffield
909a3b6791
remove erroneously added file
2023-02-22 22:35:08 +11:00
Jesse Duffield
558ceb64c7
Merge pull request #2466 from jesseduffield/migrate-reflog-tests
2023-02-22 22:33:57 +11:00
Jesse Duffield
1034962c7e
migrate more tests
2023-02-22 22:29:01 +11:00
Jesse Duffield
eabe7f462a
migrate more tests
2023-02-22 21:57:32 +11:00
Jesse Duffield
22c10479d5
migrate reflog integration tests
2023-02-22 21:15:03 +11:00
Jesse Duffield
f0572238cb
Merge pull request #2465 from jesseduffield/migrate-rebase-tests
2023-02-22 19:40:12 +11:00
Jesse Duffield
78f3a7a478
migrate interactive rebase integration tests
2023-02-22 19:36:31 +11:00
Ryooooooga
90772e1eaa
build: bump tcell version
2023-02-21 21:53:55 +09:00
Jesse Duffield
526c9dea9b
Merge pull request #2293 from jesseduffield/feature/make-discarding-harder
2023-02-21 22:03:25 +11:00
Jesse Duffield
c244c8f231
Merge pull request #2462 from jesseduffield/migrate-push-tests
2023-02-21 21:56:18 +11:00
Jesse Duffield
bfde06d049
migrate push tests
2023-02-21 21:50:03 +11:00
Jesse Duffield
6b8abb7887
Merge pull request #2458 from jesseduffield/migrate-stash-tests
2023-02-20 22:11:47 +11:00
Jesse Duffield
2b6a109e38
migrate stash tests
2023-02-20 21:52:27 +11:00
Jesse Duffield
71a30155dc
rerun test generator
2023-02-20 19:29:15 +11:00
Jesse Duffield
6ee20840b2
migrate switch tab from menu test
2023-02-20 19:28:52 +11:00
Jesse Duffield
56424eb1aa
remove x keybinding for opening menu so we now only use '?'
2023-02-20 19:28:45 +11:00
Jesse Duffield
38c7030b0f
mention path in tooltips
2023-02-20 19:28:45 +11:00
Luka Markušić
31b8524fe6
Add tooltips for discarding
2023-02-20 19:28:45 +11:00
Luka Markušić
0ae34aeeb7
Make discarding items less error prone
...
The menu is opened by `d` so this makes it harder to mess things up by
accidentally pressing `dd`.
2023-02-20 19:28:45 +11:00
Jesse Duffield
e1c376ef54
Merge pull request #2453 from stefanhaller/allow-rebasing-to-first-commit
2023-02-20 19:21:37 +11:00
Jesse Duffield
c13f550d63
Merge pull request #2455 from jesseduffield/wow-even-more-test-migrations
2023-02-20 19:06:35 +11:00
Jesse Duffield
06351c1adf
remove old tag tests
2023-02-20 19:01:08 +11:00
Jesse Duffield
0b55eaca1d
add create tag from commit test
2023-02-20 19:01:08 +11:00
Jesse Duffield
ee8c31880c
add reset to tag test
2023-02-20 19:01:08 +11:00
Jesse Duffield
daf8176dd7
add tag checkout test
2023-02-20 19:01:08 +11:00
Jesse Duffield
76109a4c44
sync test list whenever running a test in vscode
2023-02-20 19:01:08 +11:00
Jesse Duffield
082d342bf8
add tag tests
2023-02-20 19:01:08 +11:00
Jesse Duffield
39c56553b3
show tag message
2023-02-20 19:01:08 +11:00
Stefan Haller
c5cd217a65
Allow squashing fixups above the first commit of a repo
...
This includes amending changes into a given commit, since that's implemented in
terms of the former.
2023-02-20 08:29:43 +01:00
Jesse Duffield
9e2a3a87dd
improved commit test
2023-02-20 18:20:23 +11:00
Jesse Duffield
ac580ae6a0
migrate undo2
2023-02-20 18:20:23 +11:00
Jesse Duffield
9e1e20fef2
Merge pull request #2421 from Ryooooooga/tag-on-branch
2023-02-20 18:20:16 +11:00
Jesse Duffield
4b49bd406f
Update pkg/integration/tests/branch/create_tag.go
2023-02-20 17:58:08 +11:00
Stefan Haller
7351907474
Add integration tests for rebasing to the initial commit
2023-02-20 07:40:05 +01:00
Stefan Haller
a349e886ce
Allow interactive rebasing all the way down to the first commit
...
Pass --root instead of a sha when we want to rebase down to the initial commit.
2023-02-20 07:40:05 +01:00
Stefan Haller
dd61c49a15
Better error message for trying to squash or fixup the first commit
...
It's not so much the total number of commits that matters here, it's just
whether we are on the first one. (This includes the other condition.)
This allows us to get rid of the condition in rebase.go.
2023-02-20 07:40:04 +01:00
README-bot
1c3db24e44
Updated README.md
2023-02-20 06:33:57 +00:00
Jesse Duffield
15962e489d
Merge pull request #2451 from stefanhaller/edit-by-breaking-after-current-commit
2023-02-20 17:33:37 +11:00
Stefan Haller
ac9515d8c7
Revert "fix: improve backward compatibility"
...
Since we now require git 2.20, we don't need this any more.
This reverts commit 7c5f33980f
2023-02-19 16:13:31 +01:00
Ryoga
72a92d748f
test: fix TagNamesAt
...
Co-authored-by: Jesse Duffield <jessedduffield@gmail.com>
2023-02-19 23:35:38 +09:00
Ryooooooga
36c2b00336
test: add an integration test for creating tag on branches
2023-02-19 23:35:38 +09:00
Ryooooooga
67b08ac239
feat: support to create tag on branch
2023-02-19 23:31:46 +09:00
Stefan Haller
67b8ef449c
Edit by breaking after current commit
...
Instead of rebasing from the commit below the current one and then setting the
current one to "edit", we rebase from the current one and insert a "break" after
it. In most cases the behavior is exactly the same as before, except that the
new method also works if the current commit is a merge commit. This is useful if
you want to create a new commit at the very beginning of your branch (by editing
the last commit before your branch).
2023-02-19 10:21:01 +01:00
