avm-tools 0.46.0 → 0.51.0

data/vendor/git-subrepo/note/0.4.0

@@ -0,0 +1,12 @@
+- Update docs
+- Review issue/142
+  - Compare operations to master
+- Add a --no-push or --dry-run flag for push
+- Add a --rebase option for push
+- Add --message= and --edit to the init command ??
+  - Also add to doc
+- Update doc for steps of pull command to include merge and rebase
+- Test squashing on pull operations
+- Update push doc after understanding it more
+- Is --rebase for pull or push?
+  - Make sure docs are correct too.

data/vendor/git-subrepo/note/AllGitCmds

@@ -0,0 +1,148 @@
+add
+add--interactive
+am
+annotate
+apply
+archive
+bisect
+bisect--helper
+blame
+branch
+bundle
+cat-file
+check-attr
+check-ref-format
+checkout
+checkout-index
+cherry
+cherry-pick
+clean
+clone
+commit
+commit-tree
+config
+count-objects
+credential-cache
+credential-cache--daemon
+credential-store
+daemon
+describe
+diff
+diff-files
+diff-index
+diff-tree
+difftool
+difftool--helper
+fast-export
+fast-import
+fetch
+fetch-pack
+filter-branch
+fmt-merge-msg
+for-each-ref
+format-patch
+fsck
+fsck-objects
+gc
+get-tar-commit-id
+grep
+hash-object
+help
+http-backend
+http-fetch
+http-push
+hub
+imap-send
+index-pack
+init
+init-db
+instaweb
+log
+lost-found
+ls-files
+ls-remote
+ls-tree
+mailinfo
+mailsplit
+merge
+merge-base
+merge-file
+merge-index
+merge-octopus
+merge-one-file
+merge-ours
+merge-recursive
+merge-resolve
+merge-subtree
+merge-tree
+mergetool
+mktag
+mktree
+mv
+name-rev
+notes
+pack-objects
+pack-redundant
+pack-refs
+patch-id
+peek-remote
+prune
+prune-packed
+pull
+push
+quiltimport
+read-tree
+rebase
+receive-pack
+reflog
+relink
+remote
+remote-ext
+remote-fd
+remote-ftp
+remote-ftps
+remote-http
+remote-https
+remote-testgit
+remove-submodule
+repack
+replace
+repo-config
+request-pull
+rerere
+reset
+rev-list
+rev-parse
+revert
+rm
+send-pack
+sh-i18n--envsubst
+shell
+shortlog
+show
+show-branch
+show-index
+show-ref
+stage
+stash
+status
+stripspace
+submodule
+subrepo
+subtree
+symbolic-ref
+tag
+tar-tree
+unpack-file
+unpack-objects
+update-index
+update-ref
+update-server-info
+upload-archive
+upload-pack
+var
+verify-pack
+verify-tag
+web--browse
+whatchanged
+write-tree

data/vendor/git-subrepo/note/Cases

@@ -0,0 +1,32 @@
+== Users
+
+- art — project lead
+- bob — end user
+- cab — collab dev (push rights)
+- dim — forker dev (no push rights)
+- ell — third party repo owner
+
+== Repos
+- art/gallery  — art's main repo
+- art/painting — subrepo owned by art
+- ell/tickets  — subrepo owned by ell
+
+== Starting histories:
+- art/gallery  — A---B
+- art/painting — P---Q
+- ell/tickets  — T
+
+== Scenario 1
+art art/gallery$ git log
+A---B
+art art/gallery$ git subrepo clone art/painting
+art art/gallery$ ls
+painting/
+art art/gallery$ git log
+A---B---C
+       /
+     Q'
+art art/gallery$ 
+
+
+

data/vendor/git-subrepo/note/Commands

@@ -0,0 +1,33 @@
+$$$ for cmd in `cat AllGitCmds`; do git help $cmd; done
+
+
+== Inteesting Plumbing Commands:
+- git ls-tree HEAD
+- git cat-file -t <object>
+- git cat-file commit <commit>
+- git cat-file -p <commit>
+- git ls-tree <tree>
+- git ls-files --stage
+- git write-tree
+- git update-ref refs/heads/master <commit>
+- git symbolic-ref HEAD refs/heads/master
+- git show-branch
+- git hash-object <file>
+
+- git rev-list --max-parents=0 HEAD     — Find root commit
+- git cherry        — find commits in one branch that are not in another
+- git replace
+
+== Commands with DAG diagrams in their manpages:
+
+- git-commit
+- git-filter-branch
+- git-log
+- git-merge
+- git-merge-base
+- git-pull
+- git-push
+- git-rebase
+- git-rerere
+- git-rev-list
+- git-rev-parse

data/vendor/git-subrepo/note/Dags

@@ -0,0 +1,199 @@
+== ASCII commmit DAG diagrams
+
+         D--E--F--G--H
+        /     /
+    A--B-----C
+
+      .-A---M---N---O---P
+     /     /   /   /   /
+    I     B   C   D   E
+     \   /   /   /   /
+      `-------------'
+
+      .-A---N---O
+     /     /   /
+    I---------D
+
+      .-A---M---N---O---P
+     /     /   /   /   /
+    I     B   /   D   /
+     \   /   /   /   /
+      `-------------'
+
+      .-A---M---N---O
+     /     /       /
+    I     B       D
+     \   /       /
+      `---------'
+
+        D---E-------F
+       /     \       \
+      B---C---G---H---I---J
+     /                     \
+    A-------K---------------L--M
+
+    E-------F
+     \       \
+      G---H---I---J
+                   \
+                    L--M
+
+          A---B---C topic
+         /
+    D---E---F---G master
+
+
+          A---B---C topic
+         /         \
+    D---E---F---G---H master
+
+             o---o---o---B
+            /
+    ---o---1---o---o---o---A
+
+           o---o---o---o---C
+          /
+         /   o---o---o---B
+        /   /
+    ---2---1---o---o---o---A
+
+           o---o---o---o---o
+          /                 \
+         /   o---o---o---o---M
+        /   /
+    ---2---1---o---o---o---A
+
+    ---1---o---A
+        \ /
+         X
+        / \
+    ---2---o---o---B
+
+          A---B---C master on origin
+         /
+    D---E---F---G master
+
+          A---B---C remotes/origin/master
+         /         \
+    D---E---F---G---H master
+
+         B
+        /
+    ---X---A
+
+         B---C
+        /   /
+    ---X---A
+
+         B   D
+        /   /
+    ---X---A
+
+    o---o---o---A---B  origin/master
+             \
+              X---Y---Z  dev
+
+              A---B  (unnamed branch)
+             /
+    o---o---o---X---Y---Z  master
+
+          A---B---C topic
+         /
+    D---E---F---G master
+
+                  A'--B'--C' topic
+                 /
+    D---E---F---G master
+
+          A---B---C topic
+         /
+    D---E---A'---F master
+
+                   B'---C' topic
+                  /
+    D---E---A'---F master
+
+    o---o---o---o---o  master
+        |            \
+        |             o'--o'--o'  topic
+         \
+          o---o---o---o---o  next
+
+                            H---I---J topicB
+                           /
+                  E---F---G  topicA
+                 /
+    A---B---C---D  master
+
+                 H'--I'--J'  topicB
+                /
+                | E---F---G  topicA
+                |/
+    A---B---C---D  master
+
+    E---F---G---H---I---J  topicA
+
+    E---H'---I'---J'  topicA
+
+               X
+                \
+             A---M---B
+            /
+    ---o---O---P---Q
+
+    o---o---o---o---o---o---o---o---o  master
+         \
+          o---o---o---o---o  subsystem
+                                      \
+                                       *---*---*  topic
+
+    o---o---o---o---o---o---o---o  master
+        \                       \
+            o---o---o---o---o       o'--o'--o'--o'--o'  subsystem
+                            \
+                            *---*---*  topic
+
+    o---o---o---o---o---o---o---o  master
+         \                       \
+          o---o---o---o---o       o'--o'--o'--o'--o'--M  subsystem
+                           \                         /
+                            *---*---*-..........-*--*  topic
+
+    o---o---o---o---o---o---o---o  master
+                                 \
+                                  o'--o'--o'--o'--o'  subsystem
+                                                   \
+                                                    *---*---*  topic
+              o---*---o topic
+             /
+    o---o---o---*---o---o master
+
+              o---*---o---+ topic
+             /           /
+    o---o---o---*---o---o master
+
+              o---*---o---+---o---o topic
+             /           /         \
+    o---o---o---*---o---o---o---o---+ master
+
+              o---*---o-------o---o topic
+             /
+    o---o---o---*---o---o---o---o   master
+
+        $ git rebase master topic
+
+                                  o---*---o-------o---o topic
+                                 /
+    o---o---o---*---o---o---o---o   master
+
+    G   H   I   J
+     \ /     \ /
+      D   E   F
+       \  |  / \
+        \ | /   |
+         \|/    |
+          B     C
+           \   /
+            \ /
+             A
+

data/vendor/git-subrepo/note/Gists

@@ -0,0 +1,7 @@
+- https://gist.github.com/kentfredric/9285653
+
+- https://gist.github.com/anonymous/55bcf30acab99308714b
+# a + b = o
+- https://gist.github.com/anonymous/0544b465c57f01f8c4a6
+- https://gist.github.com/ingydotnet/bf92949734b6a23f2af6
+- https://gist.github.com/ingydotnet/a61b3cd1c422a17c6e5d

data/vendor/git-subrepo/note/Links

@@ -0,0 +1,25 @@
+- http://stackoverflow.com/questions/1186535/how-to-modify-a-specified-commit/
+- http://git-scm.com/book/en/Git-Tools-Rewriting-History
+- http://git.661346.n2.nabble.com/Editing-the-root-commit-td7561714.html
+- http://stackoverflow.com/questions/645450/git-how-to-insert-a-commit-as-the-first-shifting-all-the-others
+- http://stackoverflow.com/questions/6149520/git-remove-root-commit ***
+- http://fourkitchens.com/blog/2009/01/19/creating-common-branch-ancestry-hard-problem
+- http://stackoverflow.com/questions/1488753/how-to-merge-two-branches-without-a-common-ancestor
+- http://sahd.lamafam.org/?p=1534
+
+- http://www.claassen.net/geek/blog/2011/02/git-merge-strategytheirs.html
+- sahd.lamafam.org/?p=1534
+- http://stackoverflow.com/questions/2945344/selecting-merge-strategy-options-for-git-rebase
+- http://stackoverflow.com/questions/2428137/how-to-rebase-one-git-repository-onto-another-one
+- http://stackoverflow.com/questions/3080509/git-list-commits-not-pushed-to-the-origin-yet
+- http://stackoverflow.com/questions/2263674/how-do-i-find-the-next-commit-in-git
+
+- http://git-scm.com/book/ch6-7.html (Subtree Merge)
+- https://www.kernel.org/pub/software/scm/git/docs/howto/using-merge-subtree.html
+- https://help.github.com/articles/working-with-subtree-merge
+  - git pull -s subtree foo master
+
+- http://git-scm.com/2010/03/17/replace.html
+
+- http://git.661346.n2.nabble.com/subtree-merges-lose-prefix-after-rebase-td7332850.html
+- http://ruleant.blogspot.com/2013/06/git-subtree-module-with-gittrees-config.html