Skip to content

Instantly share code, notes, and snippets.

@smtlaissezfaire
Created November 20, 2008 20:26
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
Star You must be signed in to star a gist
Save smtlaissezfaire/27179 to your computer and use it in GitHub Desktop.
flavorpill@ey04-s00356 /data/flavorpill/shared $ cd ~
flavorpill@ey04-s00356 ~ $ ls
ey04-s00351 fp_current nginx nginx.configs.bkup
flavorpill@ey04-s00356 ~ $ ls
ey04-s00351 fp_current nginx nginx.configs.bkup
flavorpill@ey04-s00356 ~ $ mkdir tmp
flavorpill@ey04-s00356 ~ $ cd tmp/
flavorpill@ey04-s00356 ~/tmp $ mkdir foo
flavorpill@ey04-s00356 ~/tmp $ touch foo/bar.txt
flavorpill@ey04-s00356 ~/tmp $ git add .
fatal: Not a git repository
flavorpill@ey04-s00356 ~/tmp $ git init
Initialized empty Git repository in /home/flavorpill/tmp/.git/
flavorpill@ey04-s00356 ~/tmp $ git add .
flavorpill@ey04-s00356 ~/tmp $ gs
# On branch master
#
# Initial commit
#
# Changes to be committed:
# (use "git rm --cached <file>..." to unstage)
#
# new file: foo/bar.txt
#
flavorpill@ey04-s00356 ~/tmp $ gca
-bash: gca: command not found
flavorpill@ey04-s00356 ~/tmp $ git add .
flavorpill@ey04-s00356 ~/tmp $ git commit -a
Created initial commit 331fa22: * Add foo/bar.txt
0 files changed, 0 insertions(+), 0 deletions(-)
create mode 100644 foo/bar.txt
flavorpill@ey04-s00356 ~/tmp $ git log
flavorpill@ey04-s00356 ~/tmp $ ls
foo
flavorpill@ey04-s00356 ~/tmp $ git branch
* master
flavorpill@ey04-s00356 ~/tmp $ git checkout -b two
Switched to a new branch "two"
flavorpill@ey04-s00356 ~/tmp $ ls
foo
flavorpill@ey04-s00356 ~/tmp $ gb
-bash: gb: command not found
flavorpill@ey04-s00356 ~/tmp $ git branch
master
* two
flavorpill@ey04-s00356 ~/tmp $ git rm foo/
fatal: not removing 'foo/' recursively without -r
flavorpill@ey04-s00356 ~/tmp $ git rm -rf foo/
rm 'foo/bar.txt'
flavorpill@ey04-s00356 ~/tmp $ git commit -a -m "* Get rid of foo dir"
Created commit 96869c2: * Get rid of foo dir
0 files changed, 0 insertions(+), 0 deletions(-)
delete mode 100644 foo/bar.txt
flavorpill@ey04-s00356 ~/tmp $ ls
flavorpill@ey04-s00356 ~/tmp $ git submodule add git://github.com/smtlaissezfaire/guillotine.git foo
Initialized empty Git repository in /home/flavorpill/tmp/foo/.git/
remote: Counting objects: 6044, done.
remote: Compressing objects: 100% (2780/2780), done.
remote: Total 6044 (delta 3842), reused 5062 (delta 3157)
Receiving objects: 100% (6044/6044), 1.15 MiB | 1038 KiB/s, done.
Resolving deltas: 100% (3842/3842), done.
flavorpill@ey04-s00356 ~/tmp $ gs
# On branch two
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# new file: .gitmodules
# new file: foo
#
flavorpill@ey04-s00356 ~/tmp $ gca
-bash: gca: command not found
flavorpill@ey04-s00356 ~/tmp $ git add .
flavorpill@ey04-s00356 ~/tmp $ git status
# On branch two
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# new file: .gitmodules
# new file: foo
#
flavorpill@ey04-s00356 ~/tmp $ git commit -a -m "* Add foo submodule"
Created commit 61ae578: * Add foo submodule
2 files changed, 4 insertions(+), 0 deletions(-)
create mode 100644 .gitmodules
create mode 160000 foo
flavorpill@ey04-s00356 ~/tmp $ gs
# On branch two
nothing to commit (working directory clean)
flavorpill@ey04-s00356 ~/tmp $ git submodule
-8aae7dc07ddd94f47d999a8be86d294eb295667a foo
flavorpill@ey04-s00356 ~/tmp $ git submodule init
Submodule 'foo' (git://github.com/smtlaissezfaire/guillotine.git) registered for path 'foo'
flavorpill@ey04-s00356 ~/tmp $ git submodule update
flavorpill@ey04-s00356 ~/tmp $ gb
-bash: gb: command not found
flavorpill@ey04-s00356 ~/tmp $ git branch
master
* two
flavorpill@ey04-s00356 ~/tmp $ git checkout master
Switched to branch "master"
flavorpill@ey04-s00356 ~/tmp $ gs
# On branch master
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# foo/.autotest
# foo/.emproj
# foo/.gitignore
# foo/DEPENDENCIES
# foo/History.txt
# foo/Manifest.txt
# foo/PostInstall.txt
# foo/README.txt
# foo/Rakefile
# foo/SQL92_SPEC
# foo/TODO
# foo/benchmarks/
# foo/bin/
# foo/config/
# foo/ext/
# foo/lib/
# foo/script/
# foo/setup.rb
# foo/spec/
# foo/tasks/
# foo/website/
nothing added to commit but untracked files present (use "git add" to track)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment