gitで外部moduleを扱う方法(subtree)

git subtree add   --prefix=<prefix> --squash <repository> <commit>

% git subtree add --prefix=modules/css --squash cssrepo master
git fetch cssrepo master
From /Users/hoge/git/tests/css
 * branch            master     -> FETCH_HEAD
Added dir 'modules/css'

git commit -m 'h1タグのcolorがgoldになるように更新' -a

git subtree push  --prefix=<prefix>　--squash <repository> <refspec...>

% git subtree push --prefix=modules/css --squash cssrepo master
git push using:  cssrepo master
-n 1/      22 (0)
-n 2/      22 (1)
-n 3/      22 (2)
-n 4/      22 (3)
-n 5/      22 (4)
-n 6/      22 (5)
-n 7/      22 (6)
-n 8/      22 (7)
-n 9/      22 (8)
-n 10/      22 (9)
-n 11/      22 (10)
-n 12/      22 (11)
-n 13/      22 (12)
-n 14/      22 (13)
-n 15/      22 (14)
-n 16/      22 (15)
-n 17/      22 (16)
-n 18/      22 (17)
-n 19/      22 (18)
-n 20/      22 (19)
-n 21/      22 (19)
-n 22/      22 (20)
Counting objects: 5, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (3/3), done.
Writing objects: 100% (3/3), 351 bytes | 0 bytes/s, done.
Total 3 (delta 2), reused 0 (delta 0)
To /Users/hoge/git/tests/css.git
   ca32985..c54cf15  c54cf15de7a448205e4fe4e6991db8ef12270c18 -> master

git subtree pull  --prefix=<prefix>　--squash <repository> <refspec...>

% git subtree pull --prefix=modules/css --squash cssrepo master
remote: Counting objects: 5, done.
remote: Compressing objects: 100% (3/3), done.
remote: Total 3 (delta 2), reused 0 (delta 0)
Unpacking objects: 100% (3/3), done.
From /Users/hoge/git/tests/css
 * branch            master     -> FETCH_HEAD
Auto-merging modules/css/oreore.css
CONFLICT (content): Merge conflict in modules/css/oreore.css
Automatic merge failed; fix conflicts and then commit the result.

[alias]
    l = log

[alias]
    l = log
    subadd = "!f () { git subtree add --prefix=${1}  --squash ${2}  ${3} ;};f"
    subpush = "!f () { git subtree push --prefix=${1}  --squash ${2}  ${3} ;};f"
    subpull = "!f () { git subtree pull --prefix=${1}  --squash ${2}  ${3} ;};f"

git subtree add --prefix=<prefix> --squash <repository> <refspec>
↓
git subadd <prefix> <repository> <refspec>

git subtree push --prefix=<prefix> --squash <repository> <refspec>
↓
git subpush <prefix> <repository> <refspec>

git subtree pull --prefix=<prefix> --squash <repository> <refspec>
↓
git subpull <prefix> <repository> <refspec>

% git subtree -h
usage: git subtree add   --prefix=<prefix> <commit>
   or: git subtree add   --prefix=<prefix> <repository> <ref>
   or: git subtree merge --prefix=<prefix> <commit>
   or: git subtree pull  --prefix=<prefix> <repository> <ref>
   or: git subtree push  --prefix=<prefix> <repository> <ref>
   or: git subtree split --prefix=<prefix> <commit...>

    -h, --help            show the help
    -q                    quiet
    -d                    show debug messages
    -P, --prefix ...      the name of the subdir to split out
    -m, --message ...     use the given message as the commit message for the merge commit

options for 'split'
    --annotate ...        add a prefix to commit message of new commits
    -b, --branch ...      create a new branch from the split subtree
    --ignore-joins        ignore prior --rejoin commits
    --onto ...            try connecting new tree to an existing one
    --rejoin              merge the new branch back into HEAD

options for 'add', 'merge', 'pull' and 'push'
    --squash              merge subtree changes as a single commit

# 取り込みたい外部モジュールのリポジトリをリモートに登録
git remote add <name> <url>

# 外部モジュールをプロジェクトに取り込む
git subtree add --prefix=<prefix> --squash <repository> <refspec>

# 外部リポジトリにpush(事前にadd,commitが必要)
git subtree push --prefix=<prefix> --squash <repository> <refspec>

# 外部リポジトリの更新をpull
git subtree pull --prefix=<prefix> --squash <repository> <refspec>
git mergetool
git commit -m 'hoge' -a

[alias]
    subadd = "!f () { git subtree add --prefix=${1}  --squash ${2}  ${3} ;};f"
    subpush = "!f () { git subtree push --prefix=${1}  --squash ${2}  ${3} ;};f"
    subpull = "!f () { git subtree pull --prefix=${1}  --squash ${2}  ${3} ;};f"

git subadd <prefix> <repository> <refspec>

git subpush <prefix> <repository> <refspec>

git subpull <prefix> <repository> <refspec>