Commit graph

3575 commits

Author SHA1 Message Date
acous
b5ccfa7023 Added a comment 2015-07-07 22:25:40 +00:00
Joey Hess
60fc25e9d3 merge: Avoid creating the synced/master branch.
The branch needs to be created when merging from the remote in sync,
since we diff between it and the remote's sync branch. But git annex merge
should not be creating sync branches.
2015-07-07 15:53:27 -04:00
Joey Hess
1970c323c1 belated followup 2015-07-07 14:58:38 -04:00
Joey Hess
fcee3b2089 comment 2015-07-06 18:14:45 -04:00
boustanihani@93604388a6a2b8df16f3e34157232801a67c1021
07b09bb7aa Added a comment 2015-07-06 22:00:36 +00:00
Joey Hess
ba149973d6 followup and open bug 2015-07-06 16:20:57 -04:00
Joey Hess
33344a3266 comment 2015-07-06 16:02:17 -04:00
Joey Hess
d5b44fa7e9 comment 2015-07-06 15:41:11 -04:00
Joey Hess
895f7b8c45 followup 2015-07-06 15:08:17 -04:00
Joey Hess
41c494fd76 comment 2015-07-06 15:00:00 -04:00
Joey Hess
578e2161cd response 2015-07-06 14:56:19 -04:00
Joey Hess
d7f671e471 respinse 2015-07-06 14:51:13 -04:00
Joey Hess
0080b2000f comment 2015-07-06 14:45:54 -04:00
Joey Hess
9eaec18535 comment 2015-07-06 12:24:23 -04:00
Mattt
5ad3c9bbfd Added a comment 2015-07-05 19:40:30 +00:00
berend.van.berkum@0cc715f45d5a86c134f9192722f7adef9dc63488
d7d21df960 2015-07-04 22:50:34 +00:00
Joey Hess
4a8a042dd4 comment 2015-07-02 18:30:30 -04:00
Joey Hess
d5984c9975 update 2015-07-02 17:50:05 -04:00
Joey Hess
12a8348f9f response 2015-07-02 17:13:49 -04:00
Joey Hess
21ca88f701 response 2015-07-02 16:56:04 -04:00
Joey Hess
43f2acfd9e comment 2015-07-02 16:46:31 -04:00
Joey Hess
d4d4fd4f8d comment 2015-07-02 16:31:18 -04:00
CandyAngel
13883c52a4 Added a comment 2015-06-30 07:17:49 +00:00
Chel
402bf9b4f4 Added a comment 2015-06-30 06:32:59 +00:00
Mattt
4711c5af70 2015-06-30 03:10:26 +00:00
mike.dacre@06f2e98956fc551180a694c61abd45921cd7369b
498e95e2fc 2015-06-30 00:49:51 +00:00
acous
c2c6a4be40 2015-06-29 21:06:51 +00:00
digiuser
a5e6cf9a5d Added a comment: any updates? 2015-06-29 03:05:54 +00:00
https://me.yahoo.com/a/5j.FKrMpxZS.luSB.5ahyosMU6RcaYq2#74c60
ccf4af9229 2015-06-27 21:22:20 +00:00
chris.forum.email@596f849a9d27c1f0bcdd653d1d2dc992f21ce603
91e5753307 Added a comment 2015-06-27 11:23:05 +00:00
https://me.yahoo.com/a/5j.FKrMpxZS.luSB.5ahyosMU6RcaYq2#74c60
5267973489 Added a comment: Proxy command 2015-06-26 17:32:42 +00:00
chris.forum.email@596f849a9d27c1f0bcdd653d1d2dc992f21ce603
3969db2941 2015-06-26 11:21:37 +00:00
boustanihani@93604388a6a2b8df16f3e34157232801a67c1021
820abd4a33 Added a comment 2015-06-25 21:13:01 +00:00
https://me.yahoo.com/a/5j.FKrMpxZS.luSB.5ahyosMU6RcaYq2#74c60
383d971989 2015-06-25 18:34:01 +00:00
https://me.yahoo.com/a/5j.FKrMpxZS.luSB.5ahyosMU6RcaYq2#74c60
578fe4edfe 2015-06-25 18:32:51 +00:00
https://me.yahoo.com/a/5j.FKrMpxZS.luSB.5ahyosMU6RcaYq2#74c60
2bd6dcf7a3 2015-06-25 18:31:46 +00:00
anarcat
9a0062557c Added a comment 2015-06-24 21:40:07 +00:00
anarcat
b9323416db Added a comment: somewhat 2015-06-24 16:28:42 +00:00
boustanihani@93604388a6a2b8df16f3e34157232801a67c1021
2748d96946 Added a comment 2015-06-24 14:06:35 +00:00
anarcat
6dfb47858b Added a comment 2015-06-24 12:14:02 +00:00
boustanihani@93604388a6a2b8df16f3e34157232801a67c1021
c97112eab9 Added a comment 2015-06-24 10:14:18 +00:00
Marco
5397621751 Added a comment 2015-06-24 07:23:28 +00:00
anarcat
21624fc070 Added a comment 2015-06-24 01:34:11 +00:00
digiuser
53d88b5a49 Added a comment 2015-06-24 01:30:26 +00:00
anarcat
1039306c02 Added a comment 2015-06-24 01:17:23 +00:00
digiuser
451ad66444 Added a comment 2015-06-24 00:51:44 +00:00
digiuser
eb96217d9d Added a comment: yes 2015-06-24 00:49:22 +00:00
anarcat
e9c82824e3 Added a comment 2015-06-24 00:31:43 +00:00
anarcat
c184e89d28 Added a comment 2015-06-24 00:30:33 +00:00
digiuser
ba789f0ec2 2015-06-23 23:01:50 +00:00