Cristian Betivu
0c135515a5
Use parent view for tab navigation
2021-06-16 15:00:17 +10:00
Jesse Duffield
2b9df0ea06
fix up cheatsheet
2021-06-15 08:37:56 +10:00
Stefan Teunissen
7d1b76a349
Update dutch.go
2021-06-15 08:37:03 +10:00
Emiliano Ruiz Carletti
01e4467d76
Add test cases for pull mode
2021-06-15 08:31:07 +10:00
Emiliano Ruiz Carletti
b4e6850f98
Fix wrong ff-only configuration
2021-06-15 08:31:07 +10:00
Emiliano Ruiz Carletti
c57a0077d0
Read pull mode from gitconfig lazily
2021-06-15 08:31:07 +10:00
Emiliano Ruiz Carletti
46e500dc28
Revert "Read pull mode from git configuration"
...
This reverts commit e69e240a31
.
2021-06-15 08:31:07 +10:00
Emiliano Ruiz Carletti
d7865b3882
Read pull mode from git configuration
2021-06-15 08:31:07 +10:00
Jesse Duffield
0aad68acf0
Merge branch 'btwise-master'
2021-06-15 08:25:24 +10:00
Jesse Duffield
4969e9ce0a
gofmt
2021-06-15 08:25:07 +10:00
Jesse Duffield
ce7cbe58a0
naming change
2021-06-14 18:17:08 +10:00
Andrei Yangabishev
7588d5290b
ShowTotal flag
2021-06-10 12:43:05 +03:00
Jesse Duffield
9fdf92b226
more refactoring
...
WIP
WIP
2021-06-06 09:12:49 +10:00
Jesse Duffield
93bf691fd6
refactoring
2021-06-06 09:12:49 +10:00
Jesse Duffield
fb395bca6e
support reverting merge commits
2021-06-05 22:15:51 +10:00
Jesse Duffield
f91adf026b
fix lbl scrolling
2021-06-05 13:54:05 +10:00
Jesse Duffield
6d91661d5e
prevent closure issue
2021-06-05 13:54:05 +10:00
Jesse Duffield
90983aae65
not importing regexp
2021-06-05 13:53:25 +10:00
Jesse Duffield
f71b23b890
more explicit
2021-06-05 13:53:25 +10:00
Cristian Betivu
05a23f0e1e
Discard value after END marker
2021-06-05 13:53:25 +10:00
Cristian Betivu
fd38ad8096
More generic merge conflict detection
2021-06-05 13:53:25 +10:00
Jesse Duffield
d502c43ae8
fix tests
2021-06-05 10:58:36 +10:00
caojoshua
e7c657fba0
Docs for EditCommand.
2021-06-05 10:58:09 +10:00
caojoshua
60468d2e17
Edit command as user OS config option
2021-06-05 10:58:09 +10:00
Robert Verst
cb78cf7de4
Simplify sorting of git tags by using git's functions
2021-06-05 10:56:46 +10:00
Robert Verst
94b52af661
Remove config, make default sort order descending
2021-06-05 10:56:46 +10:00
Robert Verst
472288c81b
Add user config to change the sort order of tags
2021-06-05 10:56:46 +10:00
Jesse Duffield
258eedb38c
refactor
2021-06-02 20:33:52 +10:00
Jérémy Pagé
bc044c64b2
Remove origin prefix when creating local branch based from origin
2021-05-30 15:29:56 +10:00
Harrison Jones
e478c254d4
Handle alternate merge conflict format; add tests
2021-05-30 13:50:42 +10:00
Liberatys
44f7fc6f7c
Add global binding to open recent repos
2021-05-30 13:25:44 +10:00
btwise
a13e919d3d
add chinese for i18n
2021-05-19 17:55:26 +08:00
Petróczi Zoltán
9190e9beac
Fix englishIntroPopupMessage typo in english.go
2021-04-20 21:08:29 +10:00
Jesse Duffield
a99e6ba071
update release notes
2021-04-20 18:34:47 +10:00
Jesse Duffield
604ee02cd9
ignore east asian width setting to avoid broken frame rendering
2021-04-19 23:06:05 +10:00
Jesse Duffield
926a48a65b
smarter sizing of command log panel
2021-04-19 18:09:01 +10:00
Jesse Duffield
98375dc902
refactor merge panel
2021-04-18 18:58:09 +10:00
Jesse Duffield
e73de332a1
refactor line by line panel
2021-04-18 16:55:09 +10:00
Jesse Duffield
b28b2d05bd
force cursor to be at end of line when opening confirmation panel
2021-04-17 21:15:54 +10:00
Jesse Duffield
9e5f031553
bubble up tracked files in flat file view
2021-04-17 10:04:49 +10:00
Jesse Duffield
e42387d0da
update keybindings
2021-04-12 23:40:20 +10:00
Jesse Duffield
7d195b97c2
better squash description
2021-04-12 21:57:13 +10:00
Jesse Duffield
4fb2dba587
allow hiding random tip
2021-04-12 21:48:08 +10:00
Jesse Duffield
5453b71fd1
linting
2021-04-12 21:48:08 +10:00
Jesse Duffield
3b7e7a7f56
add random tip to command log
2021-04-12 21:48:08 +10:00
Jesse Duffield
06a8eb115c
make command log size configurable
2021-04-11 23:36:34 +10:00
Jesse Duffield
e4f0a470e9
print header for command log
2021-04-11 23:36:34 +10:00
Jesse Duffield
adee0b8ccb
add spans to i18n
2021-04-11 23:36:34 +10:00
Jesse Duffield
0bebfe454e
pull out function
2021-04-11 23:36:34 +10:00
Jesse Duffield
84b0c3df4f
ask question button
2021-04-11 22:07:29 +10:00
Jesse Duffield
069c7c9d35
fix test
2021-04-11 17:07:49 +10:00
Jesse Duffield
393ce05860
allow focusing on command log view
2021-04-11 17:07:49 +10:00
Jesse Duffield
cf78b86cb5
more support for command log and more code reuse for contexts
2021-04-11 17:07:49 +10:00
Jesse Duffield
4f03d7733a
allow showing, hiding, and scrolling the extras panel
2021-04-11 17:07:49 +10:00
Jesse Duffield
e3a14d546a
support static boxes that go outside the available size
2021-04-11 17:07:49 +10:00
Jesse Duffield
f2007f4d95
support scrolling extras view
2021-04-11 17:07:49 +10:00
Jesse Duffield
8969464b00
log TODO content when interactive rebasing
2021-04-11 17:07:49 +10:00
Jesse Duffield
6137d66914
no need to log this
2021-04-11 17:07:49 +10:00
Jesse Duffield
6fbe660f96
full coverage for logging commands
2021-04-11 17:07:49 +10:00
Jesse Duffield
74320f0075
more logging of commands
2021-04-11 17:07:49 +10:00
Jesse Duffield
bfad972f0c
fix bug where mixed reset is actually a soft reset
2021-04-11 17:07:49 +10:00
Jesse Duffield
bb918b579a
start adding support for logging of commands
2021-04-11 17:07:49 +10:00
Jesse Duffield
e145090046
add cmdLog panel
2021-04-11 17:07:49 +10:00
Jesse Duffield
8d416634ba
update release notes
2021-04-11 10:21:53 +10:00
Jesse Duffield
9f4433d8b5
allow opening merge tool
2021-04-11 10:21:53 +10:00
Jesse Duffield
2d8f7d2a7b
better way of scrolling to a merge conflict
2021-04-11 10:21:53 +10:00
Jesse Duffield
a9fbc9eda1
fix merge conflict panel not rendering
2021-04-11 10:21:53 +10:00
Jesse Duffield
e092da5f78
pause background threads when running subprocess
2021-04-10 12:16:45 +10:00
Jesse Duffield
e42e7e5cbd
fix commit amend
2021-04-10 11:54:38 +10:00
Jesse Duffield
93fac1f312
reduce flicker without worrying about carriage returns
2021-04-09 22:50:55 +10:00
Jesse Duffield
d5504fa5d0
potentially fix credentials issue
2021-04-09 00:39:04 +10:00
Jesse Duffield
273aba38d4
stricter CI
2021-04-09 00:15:48 +10:00
Jesse Duffield
cab0aa462c
fix crash at start
2021-04-09 00:10:35 +10:00
Jesse Duffield
b03e2270a0
revert no-flicker due to carriage return weirdness
2021-04-08 23:17:27 +10:00
Jesse Duffield
21049be233
support file tree mode on windows
2021-04-08 21:33:17 +10:00
Jesse Duffield
f89c47b83d
add test for building tree
2021-04-08 21:33:17 +10:00
Jesse Duffield
44f1f22068
close commit message panel after returning from subprocess
2021-04-08 20:17:16 +10:00
Jesse Duffield
a229547048
fix CI
2021-04-07 22:59:53 +10:00
Jesse Duffield
4f700c23ba
fix crash on first open
2021-04-07 22:59:53 +10:00
Jesse Duffield
cd1d1996df
add 0.27 release notes
2021-04-06 19:34:32 +10:00
Jesse Duffield
963fcc1444
don't kill the index.lock file until I decide whether it's actually a good idea
2021-04-06 19:34:32 +10:00
Jesse Duffield
c6825e3d0d
skip some tests that are failing on CI for some reason
2021-04-06 19:34:32 +10:00
Jesse Duffield
20bdba15f6
amend reword test
2021-04-06 19:34:32 +10:00
Jesse Duffield
e636857057
prevent adding staged files when renaming top commit
2021-04-06 19:34:32 +10:00
Jesse Duffield
8eb802d3a0
fix flicker issue in main view
2021-04-06 19:34:32 +10:00
Jesse Duffield
6fc031c523
hide patch panel if we're in the commits panel and we refresh and it's now exited
2021-04-06 19:34:32 +10:00
Jesse Duffield
8c93289a72
reduce chance of deadlock by using a RW mutex on the context stack
2021-04-06 19:34:32 +10:00
Jesse Duffield
fb9b6314a0
ensure we're passing the right testing struct pointer around
2021-04-06 19:34:32 +10:00
Jesse Duffield
0719a3e36e
stop checking out branches when doing a rename. Instead just move the cursor to the new position
2021-04-06 19:34:32 +10:00
Jesse Duffield
d4f3b292e6
even slower retries for CI
2021-04-06 19:34:32 +10:00
Jesse Duffield
fbab5bd444
do not refresh patch panel unless commit files panel is the current side panel
2021-04-06 19:34:32 +10:00
Jesse Duffield
f4e552f982
prevent deadlocks.
...
Hard to choose between the lock with a defer unlock in an anonymous function
vs just having an explicit unlock at the end with additional unlocks before
any early returns. The former is less error prone, but the former is much more
readable, especially if the anonymous function would have needed to return
an error value.
2021-04-06 19:34:32 +10:00
Jesse Duffield
94d26d00ba
move suggestions view behind confirmation view
2021-04-06 19:34:32 +10:00
Jesse Duffield
ace4350319
update snapshots to include tags comparison
2021-04-06 19:34:32 +10:00
Jesse Duffield
4441cf1045
fix bug with tags panel
2021-04-06 19:34:32 +10:00
Jesse Duffield
5e094c8a7c
marginally better logic for searching
2021-04-06 19:34:32 +10:00
Jesse Duffield
c683f2c96c
allow opening diff menu panel when other popup is open
2021-04-06 19:34:32 +10:00
Jesse Duffield
e5a372fa2d
allow opening filter menu panel when other popup is open
2021-04-06 19:34:32 +10:00
Jesse Duffield
02f45b679f
do not double-append contexts to the stack
2021-04-06 19:34:32 +10:00
Jesse Duffield
b1cda65dcf
show error when user attempts to commit when no files are present
2021-04-06 19:34:32 +10:00