misc_notes/git at master · mattcaron/misc_notes · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
Initial setup:

git config --global user.name "Matthew Caron"
git config --global user.email matt@mattcaron.net
git config --global core.editor /usr/bin/emacs
git config --global --add merge.tool meld

Go to dir and create initial bits:

git init

Add files:

git add

- apparently adds are for both new and changes... commit with:

git commit

- or add and commit in one shot with:

git commit -a


More info:

http://www.kernel.org/pub/software/scm/git/docs/tutorial.html

Everyday usage
http://www.kernel.org/pub/software/scm/git/docs/everyday.html

http://git.or.cz/


- Trim a subdirectory of a repository into its own repository.

   1. Clone a copy of the existing code.

      git clone ~/workspace/code/linuxppc_2_4

   2. cd into it, and remove all the other code. In this case, we want to keep util and blow away the rest.

      git filter-branch --subdirectory-filter util -- --all

   3. Now that all we want is the master branch from our original, export it:

      git-fast-export master > ../import

   4. Make your new repository directory and run

      git init

      on it.
   5. Import the exported branch into it:

      cat ../import | git-fast-import

   6. Reset the branch to a reasonable state

      git reset --hard


git-svn

git svn clone <url> -s