Elgato_dark/gitui
1
0
Fork 0
mirror of https://github.com/gitui-org/gitui synced 2026-05-23 00:48:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
1240 commits 22 branches 69 tags 87 MiB
Commit graph

1240 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephan Dilly
378b8655ab Merge branch 'master' 
Conflicts:
	Cargo.lock
	asyncgit/Cargo.toml
 2021-05-12 15:34:36 +02:00
Stephan Dilly
017701ffac update changelog 2021-05-12 15:29:56 +02:00
Stephan Dilly
8767642f93 allow pull that creates conflicts now 2021-05-12 15:24:35 +02:00
Stephan Dilly
ca808ca300
update state after merge (#703) 2021-05-12 11:37:21 +02:00
Stephan Dilly
3643cea44d
update branchlist after creating a branch (#702) 2021-05-12 11:37:08 +02:00
Stephan Dilly
f35ce0cbf4
support doing merge commit (#701) 2021-05-12 11:20:39 +02:00
Stephan Dilly
a073e0ac02 preserve ref name in annotated commit 2021-05-12 09:13:28 +02:00
Stephan Dilly
b5327a65c1 rename 2021-05-12 09:01:08 +02:00
Stephan Dilly
f30ec49886
show merge head ids in merge state (#697) 2021-05-11 18:26:12 +02:00
Stephan Dilly
bc7cef747c update changelog 2021-05-11 09:57:55 +02:00
bruceCoelho
a3b4b98d4f Preserves same modal behavior per #679 2021-05-11 09:54:19 +02:00
dependabot[bot]
7e9ab3d2d3 Bump url from 2.2.1 to 2.2.2 
Bumps [url](https://github.com/servo/rust-url) from 2.2.1 to 2.2.2.
- [Release notes](https://github.com/servo/rust-url/releases)
- [Commits](https://github.com/servo/rust-url/compare/v2.2.1...v2.2.2)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-11 08:37:53 +02:00
dependabot[bot]
755f9c08bf Bump backtrace from 0.3.58 to 0.3.59 
Bumps [backtrace](https://github.com/rust-lang/backtrace-rs) from 0.3.58 to 0.3.59.
- [Release notes](https://github.com/rust-lang/backtrace-rs/releases)
- [Commits](https://github.com/rust-lang/backtrace-rs/compare/0.3.58...0.3.59)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-11 08:37:42 +02:00
Stephan Dilly
4f6aceb3ec
merging a branch (#696) 
* merging arbitrary branch
* cleanup intermediate in-merge state
 2021-05-09 22:53:12 +02:00
Stephan Dilly
9f37835dc4 cleanup some more expects 2021-05-09 20:39:26 +02:00
Stephan Dilly
423a014b0e
allow input error to be logged and abort program (#693) 2021-05-09 19:13:02 +02:00
Stephan Dilly
b6ea2b77d1 put long filename into subfolder 2021-05-09 18:18:30 +02:00
Stephan Dilly
c0962d85b3 expect panic 2021-05-09 18:17:02 +02:00
Stephan Dilly
69f92d2ea2 add test for long foldername+long filename 2021-05-09 18:04:54 +02:00
Stephan Dilly
593a1d6d98 revert some stuff 2021-05-09 17:54:20 +02:00
Stephan Dilly
15054fed81 255 long filename is the limit on macos 2021-05-09 17:50:52 +02:00
Stephan Dilly
c8430ef4b3 more preice places for where to apply 2021-05-09 14:49:06 +02:00
Stephan Dilly
e93999af8e only run canonicalize on windows 2021-05-09 14:39:35 +02:00
Stephan Dilly
1142f6cbe8 Revert "try to get rid of touch" 
This reverts commit 1867ca1800.
 2021-05-09 14:34:09 +02:00
Stephan Dilly
1867ca1800 try to get rid of touch 2021-05-09 13:55:18 +02:00
Stephan Dilly
e39fb47265 Merge branch 'master' into fix-176-win-maxpath 2021-05-09 13:15:12 +02:00
Stephan Dilly
43d125b909 make sure clippy runs on workspace 2021-05-09 13:15:00 +02:00
Stephan Dilly
18cc49a59d Revert "use CWD in test" 
This reverts commit 94efafb33a.
 2021-05-08 19:14:54 +02:00
Stephan Dilly
94efafb33a use CWD in test 2021-05-08 19:10:26 +02:00
Stephan Dilly
cc826f5495 make error unique [skip ci] 2021-05-08 19:10:19 +02:00
Stephan Dilly
3a0f483164 make test more like what gitui does 2021-05-08 18:39:38 +02:00
Stephan Dilly
7dd61a67a7 try test stage_all 2021-05-08 18:29:17 +02:00
Stephan Dilly
09b6371e65 now we can set longpaths on 2021-05-08 18:19:03 +02:00
Stephan Dilly
c780f96a1b try creating file using shell 2021-05-08 18:14:28 +02:00
Stephan Dilly
b0fc4a152f wtf cant i even create a file with a long file name 2021-05-08 18:01:18 +02:00
Stephan Dilly
cda76b017b set longpaths 2021-05-08 17:49:59 +02:00
Stephan Dilly
28ab5155e4 test to repo windows path issue 2021-05-08 17:44:23 +02:00
Stephan Dilly
96871e7f26 bump git2-rs to rev that includes max-path fix 2021-05-08 13:10:24 +02:00
Stephan Dilly
386a31067f cleanup 2021-05-07 12:00:13 +02:00
Stephan Dilly
f836d01492 cargo update 2021-05-06 23:40:39 +02:00
Stephan Dilly
4cebb41cf4
Fix 682 smarter times in log (#683) 2021-05-06 14:11:15 +02:00
Per Westerlund
dfc6496f27 Update themes doc with Windows path 2021-05-05 19:30:35 +02:00
Stephan Dilly
56568e54aa tui update 2021-05-02 20:06:43 +02:00
Stephan Dilly
62c824a51c update changelog and fix clippy warnings 2021-04-30 15:27:01 +02:00
Stephan Dilly
42a792d5b3 warning if first line of commit msg is too long 
right now the limit is hardcoded to 50 in accordance to official git best practices

this closes #478
 2021-04-30 15:21:45 +02:00
dependabot-preview[bot]
57e02202ac Upgrade to GitHub-native Dependabot 2021-04-29 21:40:11 +02:00
Stephan Dilly
147f65562c cleanup some TODO 2021-04-27 17:51:29 +02:00
Stephan Dilly
a0d16e0f3b cargo update 2021-04-27 17:47:46 +02:00
Stephan Dilly
2a544857d8 blame gif 2021-04-27 15:36:55 +02:00
Stephan Dilly
25a9f4ff10 update readme 2021-04-27 15:17:27 +02:00