Jesse Duffield
|
7410acd1aa
|
move merge conflicts code into controller
|
2022-08-07 11:16:03 +10:00 |
|
David Pavlík
|
4db22aec0e
|
support custom SSH usernames on BitBucket, fixes #1890
|
2022-08-06 22:54:57 +02:00 |
|
nullishamy
|
a91d977f89
|
Merge branch 'master' into feat/detect-bare-repo
|
2022-08-06 14:08:59 +01:00 |
|
Jesse Duffield
|
445a625b56
|
rename merging context to mergeConflicts
|
2022-08-06 18:05:00 +10:00 |
|
README-bot
|
cd2c01d1cf
|
Updated README.md
|
2022-08-06 03:56:13 +00:00 |
|
Jesse Duffield
|
17316ca061
|
Merge pull request #2023 from jesseduffield/one-context-per-view
|
2022-08-06 13:55:56 +10:00 |
|
Jesse Duffield
|
54fb73080a
|
use ptmx map so that we can have multiple ptmx's stored for resizing
|
2022-08-06 13:49:11 +10:00 |
|
Jesse Duffield
|
524bf83a4a
|
refactor to only have one context per view
|
2022-08-06 13:49:11 +10:00 |
|
luz paz
|
7fcd1d2a6e
|
fix typo in README.md
'Maintenance' is spelled incorrectly.
|
2022-08-05 13:25:59 -04:00 |
|
Luka Markušić
|
fdf6a9cc2b
|
Test appending to empty file
|
2022-08-04 13:52:04 +02:00 |
|
Luka Markušić
|
57f86b8f90
|
Rerun integration test
|
2022-08-03 14:08:52 +02:00 |
|
Luka Markušić
|
6160d85d4f
|
Use tmpdir for tests
|
2022-08-03 14:06:12 +02:00 |
|
Luka Markušić
|
64224e7caa
|
Update pkg/commands/oscommands/os.go
Co-authored-by: Ryoga <eial5q265e5+github@gmail.com>
|
2022-08-03 13:57:26 +02:00 |
|
Luka Markušić
|
d56bb0b8ef
|
Fix the integration test
|
2022-08-03 07:55:51 +02:00 |
|
Luka Markušić
|
d238d8952b
|
Add AppendLineToFile tests
|
2022-08-03 07:55:51 +02:00 |
|
Luka Markušić
|
86d5654d20
|
Preserve trailing newline setting when adding to gitignore
|
2022-08-03 07:55:51 +02:00 |
|
Jesse Duffield
|
6dfef08efc
|
Merge pull request #2079 from jesseduffield/fix-menu-popup-focus-issue
|
2022-08-02 09:21:33 +10:00 |
|
Jesse Duffield
|
c1c6e2fac2
|
make exception for searching from menu
|
2022-08-02 09:16:01 +10:00 |
|
nullishamy
|
0b4f9f8c76
|
Refactor branching logic
|
2022-08-01 21:58:00 +01:00 |
|
nullishamy
|
a658cd4076
|
Factor out opening of recent repos
|
2022-08-01 20:05:35 +01:00 |
|
nullishamy
|
69718fb557
|
Factor out redundant statement
|
2022-08-01 19:39:39 +01:00 |
|
nullishamy
|
b9b2f58bc8
|
Format, bug fixes
|
2022-08-01 17:41:20 +01:00 |
|
nullishamy
|
bdb0b9ae6e
|
Merge branch 'master' into feat/detect-bare-repo
|
2022-08-01 17:05:33 +01:00 |
|
nullishamy
|
2866827ca8
|
Apply suggestions from code review
|
2022-08-01 17:05:16 +01:00 |
|
Jesse Duffield
|
932b0b593e
|
add integration test to ensure we don't run into issues with popup focus
|
2022-08-01 22:17:06 +10:00 |
|
Jesse Duffield
|
3ee2ad511e
|
prevent crash when opening recent repos panel if no recent repos are present
|
2022-08-01 22:10:08 +10:00 |
|
Jesse Duffield
|
debc58b6c5
|
fix popup focus issue
|
2022-08-01 22:09:48 +10:00 |
|
Jesse Duffield
|
fab2e14b55
|
fix issue caused by opening a menu over a prompt
|
2022-08-01 21:38:57 +10:00 |
|
Jesse Duffield
|
81f80ce968
|
Merge pull request #2077 from jesseduffield/file-node-fix
handle nil properly with file nodes
|
2022-08-01 20:36:26 +10:00 |
|
Jesse Duffield
|
95426c5e46
|
handle nil properly with file nodes
|
2022-08-01 20:32:01 +10:00 |
|
Jesse Duffield
|
4ffc9a5395
|
Merge pull request #2076 from jesseduffield/build-info
|
2022-08-01 20:22:27 +10:00 |
|
Jesse Duffield
|
86ac309e08
|
add build info when building from source
|
2022-08-01 20:16:50 +10:00 |
|
nullishamy
|
9987e65c35
|
Merge branch 'master' into feat/detect-bare-repo
|
2022-08-01 03:14:49 +01:00 |
|
Jesse Duffield
|
69f4292fe3
|
Merge pull request #2075 from jesseduffield/generic-trees
|
2022-07-31 19:47:06 +10:00 |
|
Jesse Duffield
|
682be18507
|
refactor to use generics for file nodes
use less generic names
|
2022-07-31 19:43:14 +10:00 |
|
Jesse Duffield
|
2ca2acaca5
|
Merge pull request #2072 from jesseduffield/optimistic-file-rendering
|
2022-07-31 19:31:23 +10:00 |
|
Jesse Duffield
|
5f4c29d7b5
|
Merge pull request #2005 from mark2185/feature/recent-repos-path
Show active branch for recent repo
|
2022-07-31 19:30:30 +10:00 |
|
Luka Markušić
|
44de380c2b
|
Add i18n for unknown branch
|
2022-07-31 08:57:57 +02:00 |
|
Luka Markušić
|
37bdbd9a21
|
Display short SHA when in detached HEAD state
|
2022-07-31 08:51:27 +02:00 |
|
Luka Markušić
|
767ef31661
|
Use filepath.Join instead of manual concat
|
2022-07-31 08:43:31 +02:00 |
|
README-bot
|
bb64fe4309
|
Updated README.md
|
2022-07-31 06:20:16 +00:00 |
|
Jesse Duffield
|
c81c046615
|
Merge pull request #2059 from sportshead/master
|
2022-07-31 16:19:59 +10:00 |
|
Jesse Duffield
|
a905165046
|
remove double negatives
|
2022-07-31 16:11:39 +10:00 |
|
Jesse Duffield
|
7077ea428f
|
add optimistic rendering for staging and unstaging files
|
2022-07-31 14:34:57 +10:00 |
|
sportshead
|
f2880ecb46
|
Add empty output message and refreshing to showOutput
|
2022-07-31 12:04:40 +08:00 |
|
Luka Markušić
|
966733240c
|
Refactor a bit, enable worktrees
|
2022-07-30 19:02:19 +02:00 |
|
Luka Markušić
|
25ddac0d8f
|
Gotta go fast
|
2022-07-30 17:42:15 +02:00 |
|
Luka Markušić
|
7c09ce3871
|
Parallelize fetching current branch
|
2022-07-30 17:05:17 +02:00 |
|
Luka Markušić
|
e6e4513f45
|
Show active branch for recent repo
Split recent repo menu into three columns
|
2022-07-30 17:05:17 +02:00 |
|
Luka Markušić
|
9c6239df3d
|
Worktrees should not be filtered out
But non-git directories should
|
2022-07-30 17:03:30 +02:00 |
|