Skip to content

Commit

Permalink
minor details
Browse files Browse the repository at this point in the history
  • Loading branch information
fgarcia committed Nov 29, 2011
1 parent ab41996 commit 6d962ad
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions git-pnote-example.txt
Expand Up @@ -10,18 +10,19 @@

; Create a new repositry
$ git init
$ git add .
$ git add
$ git commit

; Create a central shared repository
$ git init --bare --shared

; If you already have a repository
; Make en exact copy with tags and branches
git push ssh://example.org/git/foo.git '*:*'
$ git push ssh://example.org/git/foo.git '*:*'

; Copy/duplicate/clone
$ git clone ssh://you@host.org/proj.git

# Keywords
master ; default development branch
origin ; default upstream repository
Expand Down Expand Up @@ -78,7 +79,7 @@
git diff --base $file
git diff --ours $file
git diff --theirs $file

git add conflict_file.txt ; Solve conflict
git rebase --continue

Expand All @@ -88,7 +89,7 @@
git checkout --ours index.html
git checkout --theirs _layouts/default.html

; Merge repositores A, B, C
; Merge three repositories A, B, C
mkdir combined && cd combined
git init
git fetch ../A master:A
Expand Down Expand Up @@ -145,3 +146,5 @@

On Windows make sure .ssh folder is in your user folder at
"Documments and Settings"

vim:ft=pnote

0 comments on commit 6d962ad

Please sign in to comment.