Commit graph

845 commits

Author SHA1 Message Date
Jesse Duffield ca2eec60fe
Merge pull request #285 from antham/add-tests-part-5
Add tests to pkg/commands/git - Part 5
2018-09-16 22:03:10 +10:00
Anthony HAMON c1b7a21631 commands/git : move tests 2018-09-16 11:11:09 +02:00
Anthony HAMON 91832f2c5e commands/git : add tests, refactor a bit 2018-09-16 11:11:09 +02:00
Jesse Duffield fa08c6c2a2
Merge pull request #284 from mingrammer/main-error
main: display an error message instead of panic when setup fails
2018-09-14 09:38:21 +10:00
mingrammer 3cf84a5af1 main: display an error message instead of panic when setup fails 2018-09-14 00:23:11 +09:00
Jesse Duffield eb4b5cd43b
Merge pull request #282 from antham/add-tests-part-4
Add tests to pkg/commands/git - Part 4
2018-09-13 09:34:28 +10:00
Anthony HAMON c92510ceba commands/git : add tests on SquashFixupCommit and refactor 2018-09-12 22:45:52 +02:00
Anthony HAMON 65a24d70c3 commands/git : add tests on SquashPreviousTwoCommits 2018-09-12 20:43:03 +02:00
Jesse Duffield 79940b7ba9
Merge pull request #279 from jesseduffield/hotfix/file-ordering
Restore old file merging algorithm
2018-09-12 18:26:29 +10:00
Jesse Duffield 2ce8ac5850 restore old file sorting algorithm 2018-09-12 18:24:03 +10:00
Jesse Duffield 73e2c1005a
Merge pull request #277 from antham/add-tests-part-3
Add tests to pkg/commands/git - Part 3
2018-09-12 17:35:09 +10:00
Anthony HAMON 97e0a6dc45 commands/git : remove extra space 2018-09-12 07:51:14 +02:00
Anthony HAMON 9bad0337fe commands/git : swap global/local get config 2018-09-12 07:50:49 +02:00
Anthony HAMON f03544f392 commands/git : fix test 2018-09-11 22:20:59 +02:00
Anthony HAMON 0aba49af2b commands/git : fix typo 2018-09-11 21:56:17 +02:00
Anthony HAMON ccbc5e569c commands/git : add test to Push func, refactor 2018-09-11 21:56:17 +02:00
Anthony HAMON 415aad600c commands/git : add test to Commit func, refactor 2018-09-11 21:56:17 +02:00
Anthony HAMON d23577168f commands/git : remove dependency on gocui 2018-09-11 21:56:17 +02:00
Anthony HAMON 5c204b2813 commands/git: rewrite UsingGpg, add tests 2018-09-11 21:56:17 +02:00
Jesse Duffield 7d86278507
Merge pull request #274 from sascha-andres/master
fix: escape quote character on Linux
2018-09-11 09:07:36 +10:00
Sascha Andres 985196f5aa docs: add comments for new test code 2018-09-10 17:36:59 +02:00
Sascha Andres 9ec5a04cf5 merge: remote-tracking branch 'upstream/master' 2018-09-10 10:33:20 +02:00
Sascha Andres bb9698810d refactor: move fallback to platform struct
Co-authored-by: Jesse Duffield <jessedduffield@gmail.com>
2018-09-10 10:31:15 +02:00
Jesse Duffield 7f4371ad71
Merge pull request #275 from mjarkk/master
Translated untranslated dutch phrases
2018-09-10 18:15:15 +10:00
Sascha Andres 74144e3892 fix: remove call to fmt.Println 2018-09-10 10:10:10 +02:00
mjarkk 07f87eb7cf Added missing dutch translations 2018-09-10 08:08:53 +02:00
Mark Kopenga 5600da9ee7
Merge pull request #11 from jesseduffield/master
updated to latest master
2018-09-10 07:28:11 +02:00
Sascha Andres ba0cc20e22 feat: add test cases 2018-09-10 06:51:19 +02:00
Sascha Andres 717913e64c fix: escape quote character on Linux
Co-authored-by: Dawid Dziurla <dawidd0811@gmail.com>

Closes #269
2018-09-10 06:36:15 +02:00
Jesse Duffield 5a0431bb62
Merge pull request #272 from antham/master
Add missing go.sum file
2018-09-10 10:58:22 +10:00
Jesse Duffield 1e357e2362
Merge branch 'master' into master 2018-09-10 10:02:06 +10:00
Jesse Duffield c3b62a555c
Merge pull request #265 from antham/add-tests-part-2
Add tests to pkg/commands/git - Part 2
2018-09-10 10:01:55 +10:00
Jesse Duffield 557461c016
Merge branch 'master' into add-tests-part-2 2018-09-10 09:47:14 +10:00
Jesse Duffield c2e670104e
Merge branch 'master' into master 2018-09-10 09:46:01 +10:00
Jesse Duffield bea9971f9c
Merge pull request #271 from glvr182/feature/ignore-hidden-files
Change the gitignore a bit to cover more
2018-09-10 09:45:29 +10:00
Jesse Duffield a8fdf1a646
Merge branch 'master' into feature/ignore-hidden-files 2018-09-10 09:45:18 +10:00
Jesse Duffield f8ab4f4073
Merge pull request #234 from dawidd6/feature/help
WIP: Add menu panel (cheatsheet)
2018-09-10 09:43:28 +10:00
Anthony HAMON 24f15742d0 commands/git : rename variable 2018-09-09 20:08:46 +02:00
Glenn Vriesman 700f8c7e79 REPO: Added TODO entries to the gitignore for jesse 2018-09-09 13:37:38 +02:00
Anthony HAMON 28e8d6e472 add go.sum 2018-09-09 11:13:18 +02:00
Anthony HAMON 6076a75643 commands/git : fix function call 2018-09-09 10:52:34 +02:00
Anthony HAMON b46e4b4976 commands/git : add several tests, do some cleanup 2018-09-09 10:52:34 +02:00
Anthony HAMON 99eca7b000 commands/git : replace make function 2018-09-09 10:52:34 +02:00
Anthony HAMON a0faaf6893 commands/git : remove includes function 2018-09-09 10:52:34 +02:00
Anthony HAMON 56ad07ebab commands/git : rename functions 2018-09-09 10:52:34 +02:00
Anthony HAMON 1ecd74c357 commands/git : add tests for GetCommitsToPush 2018-09-09 10:52:34 +02:00
Anthony HAMON ceab9706cb commands/git : add tests for UpstreamDifferentCount 2018-09-09 10:52:34 +02:00
Anthony HAMON 1cc7e9c02a rewrite to use subtests 2018-09-09 10:52:34 +02:00
Dawid Dziurla 63e400647a
shorter english string 2018-09-09 10:47:13 +02:00
Dawid Dziurla 6f7de83bce
Merge branch 'master' into feature/help
conflicts resolved
2018-09-09 10:41:01 +02:00