j_k_234@b2b1aa189bf195cefd815fc0fe70e0ebbe2b8077
56098f2ad5
Added a comment
2016-04-10 13:47:30 +00:00
j_k_234@b2b1aa189bf195cefd815fc0fe70e0ebbe2b8077
9090987780
2016-04-10 13:07:32 +00:00
Joey Hess
5e190913a4
add AdjBranch newtype; some simplications
2016-04-09 15:10:26 -04:00
Joey Hess
17acfe8032
devblog
2016-04-09 14:20:34 -04:00
Joey Hess
8623f23aac
Merge branch 'master' of ssh://git-annex.branchable.com
2016-04-09 14:18:17 -04:00
Joey Hess
b5be04027c
change name of basis branch
...
Making the name look too much like the adjusted branch was ambiguous.
2016-04-09 14:17:20 -04:00
Joey Hess
7d28110c68
fix master push overwrite race when updating adjusted branch, by maintaining basis ref
2016-04-09 14:12:25 -04:00
Joey Hess
f0ddc0a75c
comment
2016-04-09 13:22:27 -04:00
spwhitton
bcc5e0bafc
file bug
2016-04-09 17:16:07 +00:00
Joey Hess
b3b1d72d57
Merge branch 'master' of ssh://git-annex.branchable.com
2016-04-09 12:31:27 -04:00
Antoine Beaupré
a5158baa89
possible fix for markdown generation with pandoc
2016-04-09 11:04:42 -04:00
Antoine Beaupré
c363bea652
attack the manpage problem
2016-04-09 10:40:53 -04:00
0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d6730
d89161e13f
Added a comment: freenet special remote
2016-04-09 10:37:23 +00:00
Antoine Beaupré
d1dd9b5a4b
respond
2016-04-09 00:41:41 -04:00
ExGen
196547ec8d
Added a comment: comment 4
2016-04-08 22:00:33 +00:00
Joey Hess
c2ce3dfed3
windows does not like filenames starting with a dot, rename
2016-04-08 17:08:07 -04:00
ExGen
f970490750
Added a comment: comment 3^^
2016-04-08 21:03:15 +00:00
Joey Hess
56dee9af10
fix build with ghc 7.6.3
2016-04-08 16:09:00 -04:00
Joey Hess
c4be17d159
Merge branch 'master' of ssh://git-annex.branchable.com
2016-04-08 15:35:55 -04:00
Joey Hess
973d66bb67
update
2016-04-08 15:31:53 -04:00
Joey Hess
1e005feee2
fix build on windows with older ghc
2016-04-08 15:26:50 -04:00
Joey Hess
cf06dac2b8
hard links on windows
...
* annex.thin and annex.hardlink are now supported on Windows.
* unannex --fast now makes hard links on Windows.
2016-04-08 15:25:32 -04:00
Joey Hess
251405eca2
avoid withWorkTreeRelated affecting annex symlink calculation
2016-04-08 14:24:00 -04:00
0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d6730
c0008c0c53
2016-04-08 16:35:37 +00:00
ggreif@8132a868199b4ffec14150c87f538dc06a538220
441dfba4c3
pull request for Bup.hs
2016-04-08 16:17:53 +00:00
Joey Hess
f41045bf19
Merge branch 'master' of ssh://git-annex.branchable.com
2016-04-06 19:32:01 -04:00
Joey Hess
555e235e1c
devbog
2016-04-06 19:26:25 -04:00
Joey Hess
64de6dcc74
one little bug..
2016-04-06 19:23:32 -04:00
Joey Hess
6549049142
fix commit tree after merge into adjusted branch
2016-04-06 19:22:15 -04:00
Joey Hess
887ef93a7f
run out of tree merge with --no-ff
...
This is how direct mode does it too, and somehow, for reasons that
currently escape me, this makes git merge not care if it's run with an
empty work tree.
2016-04-06 18:40:28 -04:00
Joey Hess
60bdffe43e
fix auto merge conflict resolution when doing out of tree merge for adjusted branch
2016-04-06 17:32:04 -04:00
Joey Hess
b9e4e2ba84
new method for merging changes into adjusted branch that avoids unncessary merge conflicts
...
Still needs work when there are actual merge conflicts.
2016-04-06 15:36:18 -04:00
https://me.yahoo.com/a/n0FWjM0duI0IytxNwAsBBv1BvGd8rA--#a9eec
c0ad345e45
2016-04-06 19:29:51 +00:00
Gus
03e679ce12
2016-04-06 16:05:42 +00:00
timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc2991
3606b2746d
Added a comment
2016-04-06 10:14:30 +00:00
timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc2991
1c1a7bdaa4
Added a comment
2016-04-05 22:29:06 +00:00
timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc2991
8f3c50cb27
Added a comment
2016-04-05 21:28:20 +00:00
Joey Hess
eb9ac8d6d7
sync: Show output of git commit.
...
Rationalle: User might have hook scripts whose output they want to see.
Also, git commit output may tell the user they forgot to add a file.
The output is not too ugly when there's nothing to commit.
2016-04-05 16:22:21 -04:00
Joey Hess
b9c16568ef
Merge branch 'master' of ssh://git-annex.branchable.com
2016-04-05 14:30:13 -04:00
Joey Hess
68ef108cb7
another reason
2016-04-05 14:29:33 -04:00
zarel
0fed223e4d
Added a comment
2016-04-05 17:24:06 +00:00
timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc2991
9d1c79d48d
2016-04-05 12:49:52 +00:00
timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc2991
70b2621c01
2016-04-05 12:44:18 +00:00
timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc2991
886f5b2d12
Added a comment
2016-04-05 09:19:59 +00:00
szrc
08897ff3a2
Added a comment
2016-04-05 01:18:53 +00:00
timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc2991
ec0fcc8756
Added a comment
2016-04-04 21:21:56 +00:00
Joey Hess
7a77985f37
hack to get escaped quotes right on git-annex-shell man page
2016-04-04 17:11:35 -04:00
Joey Hess
9faf5c8837
devblog
2016-04-04 17:01:46 -04:00
Joey Hess
ea4ca877ce
comment
2016-04-04 17:01:08 -04:00
Joey Hess
398458b0d4
wording
2016-04-04 16:57:13 -04:00
