Joey Hess
6d74830afd
note
2011-12-26 14:41:20 -04:00
Joey Hess
d74f8db808
de-emphasize git annex merge
2011-12-26 14:38:55 -04:00
Joey Hess
2b97f5381a
add tweak-fetch command, for use in the tweak-fetch hook
...
tweak-fetch is a new git hook I have developed (not yet accepted into
git, but looking bright). Amoung other things, the hook can be used to
observe what is being fetched, notice remote git-annex branches that might
be updated, and merge them into the git-annex branch.
This will solve problems where users do a git pull, immediately followed
by a push, and it refuses to push because their git-annex branch is
diverged, and they neither ran git annex merge by hand, nor ran other
git-annex commands that auto-merge.
The tweak-fetch is written by git annex init. Of course, existing
repositories won't have it, which is ok, because git-annex still
automatically does a merge if changed branches have appeared. Indeed,
it will always need to do that check, as long as it needs to support
support git-annex branches that might be updated by other means.
Eventually though, I will want to ensure all repositories have the
tweak-fetch hook. Perhaps a minor verison upgrade to ensure it is added?
A subtlety of the hook is that when it's run, the remote tracking refs
have not yet been updated. So Annex.Branch.updateTo has to be careful to
only use the sha1 that was fetched, not the branch name. The branch
name is only used in the commit message.
The other tricky thing is that git tweak-fetch hook should *only*
output lines in a specific format, and git will be unhappy if it also
outputs status messages, etc. So those messages are sent to stderr.
2011-12-26 14:25:37 -04:00
http://www.openid.albertlash.com/openid/
2101ef20d1
2011-12-25 01:55:45 +00:00
http://www.openid.albertlash.com/openid/
899b20f89c
2011-12-24 17:05:38 +00:00
Joey Hess
ffefe742d8
fix typo
2011-12-24 12:59:45 -04:00
Joey Hess
82cc5d3d31
slightly improve typography
2011-12-24 12:59:45 -04:00
http://joey.kitenet.net/
0c107c98de
Added a comment
2011-12-24 16:54:31 +00:00
http://joey.kitenet.net/
c87a814046
Added a comment
2011-12-24 16:49:13 +00:00
http://www.joachim-breitner.de/
ab1435310c
Added a comment
2011-12-24 12:51:43 +00:00
http://www.joachim-breitner.de/
ffe9973ed5
Added a comment
2011-12-24 12:49:41 +00:00
http://www.openid.albertlash.com/openid/
ccddaf2f5c
Added a comment
2011-12-24 06:08:46 +00:00
http://adamspiers.myopenid.com/
4eafd43cce
Added a comment: Any update on this?
2011-12-24 01:05:08 +00:00
http://adamspiers.myopenid.com/
f78b0cb4e7
2011-12-24 00:48:37 +00:00
http://adamspiers.myopenid.com/
1202e605d7
2011-12-24 00:45:43 +00:00
http://adamspiers.myopenid.com/
010780dc55
add a page for openSUSE install instructions
2011-12-24 00:13:43 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmKPMUX0YHBjE93eBsEnacwZsddSDue3PY
4fb3114228
Added a comment
2011-12-23 22:04:09 +00:00
http://joey.kitenet.net/
56e4acfa24
Added a comment
2011-12-23 19:19:53 +00:00
http://adamspiers.myopenid.com/
bfa5509dbd
Added a comment: Cool
2011-12-23 19:16:51 +00:00
http://joey.kitenet.net/
131d560ba6
Added a comment
2011-12-23 18:43:05 +00:00
http://joey.kitenet.net/
cbaf13e587
Added a comment
2011-12-23 18:02:24 +00:00
http://joey.kitenet.net/
d5889f8271
Added a comment
2011-12-23 17:52:21 +00:00
http://adamspiers.myopenid.com/
74e86b6da2
Added a comment
2011-12-23 17:24:59 +00:00
http://adamspiers.myopenid.com/
d3e80eabe8
Added a comment
2011-12-23 17:22:12 +00:00
http://adamspiers.myopenid.com/
fe65981de8
Added a comment
2011-12-23 17:14:03 +00:00
Joey Hess
3b1c80d795
fix
2011-12-23 12:58:39 -04:00
Joey Hess
6fcf76bcd1
slight simplification
2011-12-23 12:57:52 -04:00
Joey Hess
a0227e81f9
put in explicit fetch ; merge in walkthrough for now
...
and link to centralized repository tutorial
2011-12-23 12:55:11 -04:00
http://joey.kitenet.net/
304930f1fc
Added a comment
2011-12-23 16:50:26 +00:00
Joey Hess
9e6ff9e734
improve wording to not imply a pull is done by merge
2011-12-23 12:49:28 -04:00
http://joey.kitenet.net/
0df51acc52
2011-12-23 16:20:43 +00:00
http://joey.kitenet.net/
e2b2c67f05
Added a comment
2011-12-23 16:16:19 +00:00
http://joey.kitenet.net/
538665f477
Added a comment
2011-12-23 16:07:39 +00:00
Joey Hess
8a2105c90a
Merge branch 'master' of ssh://git-annex.branchable.com
2011-12-23 11:34:10 -04:00
http://adamspiers.myopenid.com/
abba5d3e82
Added a comment: I think Matt is right.
2011-12-23 14:04:46 +00:00
http://adamspiers.myopenid.com/
77ffd070ad
Added a comment
2011-12-23 13:31:34 +00:00
Joey Hess
7227dd8f21
add escape_var hack
...
Makes it easy to find files with duplicate contents, anyway.. :)
2011-12-23 01:08:19 -04:00
Joey Hess
13a0c292b3
update example to actually work with new --format option
2011-12-23 01:08:19 -04:00
Joey Hess
eb7ef6264e
fix
2011-12-23 01:08:18 -04:00
Joey Hess
a0872a8ec3
better data type
2011-12-22 19:56:31 -04:00
Joey Hess
06bafae9e0
Format strings can be specified using the new --find option, to control what is output by git annex find.
2011-12-22 18:31:44 -04:00
http://adamspiers.myopenid.com/
c02605919b
Added a comment: How much memory would it actually use anyway?
2011-12-22 20:15:23 +00:00
http://adamspiers.myopenid.com/
38ad1065c9
Added a comment
2011-12-22 20:04:21 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlrnOT_XLcNNtmIwVdAJCJYu1BwAAOYtBI
2a7246864e
2011-12-22 19:33:11 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlrnOT_XLcNNtmIwVdAJCJYu1BwAAOYtBI
1071a3cf02
2011-12-22 19:21:50 +00:00
Joey Hess
6bffe509d7
Add --include, which is the same as --not --exclude.
2011-12-22 14:00:17 -04:00
http://joey.kitenet.net/
30cf6ce81c
Added a comment
2011-12-22 16:39:24 +00:00
http://adamspiers.myopenid.com/
6808b08c1a
Added a comment: Here's a Perl version
2011-12-22 15:43:52 +00:00
http://adamspiers.myopenid.com/
97bef4af73
Added a comment: List the duplicate filenames, then let the user decide what to do
2011-12-22 12:31:36 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnXybLxkPMYpP3yw4b_I6IdC3cKTD-xEdU
a99af6338e
Added a comment
2011-12-21 16:06:26 +00:00
