Commit graph

45 commits

Author SHA1 Message Date
Jesse van den Kieboom 8eb1e3ed66 Add basic merging support 2015-08-14 00:55:43 +02:00
Jesse van den Kieboom 687659255b Factor out commit index 2015-08-13 20:03:13 +02:00
Jesse van den Kieboom 75d1148df9 Use config snapshot when reading config values 2015-07-31 00:57:18 +02:00
Jesse van den Kieboom ededa1912b Do not ignore submodules for checking index
https://bugzilla.gnome.org/show_bug.cgi?id=742376
2015-01-06 19:54:07 +01:00
Jesse van den Kieboom 5f207a3127 Added Stage.stage_commit 2014-12-14 12:05:54 +01:00
Jesse van den Kieboom 0c3b69cb30 Implement enumeration of submodules in commit view 2014-12-14 10:06:21 +01:00
Jesse van den Kieboom 8d78cd6267 Implemented multiple selection for commit 2014-07-11 19:04:19 +02:00
Jesse van den Kieboom ed1412628c Added supported diff options for commit diff 2014-07-10 19:56:24 +02:00
Jesse van den Kieboom e815ebc78f Implemented selection discard 2014-07-01 15:14:25 +02:00
Jesse van den Kieboom adeb31e85c Do not write index after revert 2014-07-01 14:15:38 +02:00
Jesse van den Kieboom d742af7951 Use ggit vapi instead of gir 2014-06-30 22:01:30 +02:00
Jesse van den Kieboom 2904a38928 Reset head tree cache
https://bugzilla.gnome.org/show_bug.cgi?id=728208
2014-06-25 14:53:13 +02:00
Jesse van den Kieboom 682b31a609 Use Ggit.Commit.amend to amend 2014-06-24 17:30:08 +02:00
Ignacio Casal Quinteiro f255754993 Fix for renamed reflog api 2014-06-23 16:34:32 +02:00
Ignacio Casal Quinteiro a0cd8e41a9 Fix for renamed api 2014-06-23 16:22:32 +02:00
Jesse van den Kieboom 92d891bd4e Fix unstage_patch by reversing applying patch 2014-01-05 20:10:46 +01:00
Jesse van den Kieboom e327c0fa62 Factor out patching and implement unstage_patch 2014-01-02 13:39:20 +01:00
Jesse van den Kieboom 15bf369e62 Implement patchset staging 2014-01-02 13:39:20 +01:00
Jesse van den Kieboom 94ff779311 Remove to_string debug methods 2014-01-02 13:39:20 +01:00
Jesse van den Kieboom e3f3f79156 Move PatchSet to gitg-stage 2014-01-02 13:39:19 +01:00
Jesse van den Kieboom 8b84229a3f Do not force reading index 2013-11-23 14:54:59 +01:00
Jesse van den Kieboom 9f8b7780c1 Update for new Ggit.Diff API 2013-11-23 14:54:29 +01:00
Jesse van den Kieboom 6a0b35aca1 Do not force index changes when amending 2013-07-07 16:47:21 +02:00
Jesse van den Kieboom e6dfaac72b Allow async thread functions to throw errors 2013-07-07 16:14:30 +02:00
Jesse van den Kieboom 3b090c7429 Add (amend) in reflog when amending commit 2013-07-06 13:36:55 +02:00
Jesse van den Kieboom 2e2f39ff52 Implemented amend 2013-07-06 13:33:53 +02:00
Jesse van den Kieboom 2a663d52d0 Correctly set author date in hooks 2013-07-06 12:24:04 +02:00
Jesse van den Kieboom dfd45efb82 Remove redundant revert_index 2013-07-06 10:14:06 +02:00
Jesse van den Kieboom 674844f3c5 Properly update reflog after commit 2013-07-05 15:46:00 +02:00
Jesse van den Kieboom bfc01cfab7 Fix async handling of pre commit hook 2013-07-05 15:45:46 +02:00
Jesse van den Kieboom f4d7f9ba50 Fill in commit stubs 2013-07-05 13:05:01 +02:00
Jesse van den Kieboom a591d4cfca Stub out commit procedure 2013-07-04 10:28:06 +02:00
Jesse van den Kieboom 28d6535c2f Implemented reverting index 2013-07-03 19:12:26 +02:00
Jesse van den Kieboom 312f5e12e1 Add convenience stage functions for relative paths 2013-07-03 18:52:42 +02:00
Jesse van den Kieboom 8f1303dc9e Also diff new files in commit 2013-07-03 17:14:00 +02:00
Jesse van den Kieboom d5095154a0 Add diff_index and diff_workdir convenience methods on stage 2013-07-03 16:42:11 +02:00
Jesse van den Kieboom c66b61e969 Get head tree asynchronously 2013-07-03 16:41:22 +02:00
Jesse van den Kieboom fc4a336468 enum thingie 2013-07-03 16:40:56 +02:00
Jesse van den Kieboom 9034877471 Ref thingie 2013-07-03 16:40:48 +02:00
Jesse van den Kieboom 92e4d71dbe Allow specifying status options in enumerator 2013-07-03 16:40:30 +02:00
Jesse van den Kieboom ecdde804b8 Implemented stage, unstage, delete and revert on files 2013-07-03 09:50:58 +02:00
Jesse van den Kieboom 82e3ff6d2d Cache stage status files enumerator 2013-07-03 09:50:58 +02:00
Jesse van den Kieboom 290aba1c2c Make stage classes objects 2013-07-03 09:50:58 +02:00
Jesse van den Kieboom e088612650 Separated stage status enumerator in separate file 2013-07-03 09:50:58 +02:00
Jesse van den Kieboom b7306286a3 Initial stage class with enumeration of status files 2013-07-03 09:50:58 +02:00