Script started on Thu 17 Jan 2013 01:59:15 PM MST
]0;hindle1@st-francis: /tmp/sunhindle1@st-francis:/tmp/sun$ promkdir proj1
]0;hindle1@st-francis: /tmp/sunhindle1@st-francis:/tmp/sun$ cd proj1/
]0;hindle1@st-francis: /tmp/sun/proj1hindle1@st-francis:/tmp/sun/proj1$ git init
Initialized empty Git repository in /tmp/sun/proj1/.git/
]0;hindle1@st-francis: /tmp/sun/proj1hindle1@st-francis:/tmp/sun/proj1$ cman df > k.txtproj1.txt
]0;hindle1@st-francis: /tmp/sun/proj1hindle1@st-francis:/tmp/sun/proj1$ man df > proj1.txt[1@w[1@c1.txt.txt.txt1.txt
]0;hindle1@st-francis: /tmp/sun/proj1hindle1@st-francis:/tmp/sun/proj1$ man wc > proj1.1.txt.txt2.txt[1@h[1@u[1@h[1@m[1@a[1@n
<standard input>:977: warning [p 8, 0.8i, div `3tbd1,0', 0.0i]: cannot adjust line
<standard input>:986: warning [p 8, 0.8i, div `3tbd4,0', 0.0i]: cannot adjust line
]0;hindle1@st-francis: /tmp/sun/proj1hindle1@st-francis:/tmp/sun/proj1$ heaheadhead proj1.2.txt 
MAN(1)                        Manual pager utils                        MAN(1)



NAME
       man - an interface to the on-line reference manuals

SYNOPSIS
       man  [-C  file]  [-d]  [-D]  [--warnings[=warnings]]  [-R encoding] [-L
       locale] [-m system[,...]] [-M path] [-S list]  [-e  extension]  [-i|-I]
]0;hindle1@st-francis: /tmp/sun/proj1hindle1@st-francis:/tmp/sun/proj1$ qcd ls
proj1.1.txt  proj1.2.txt  proj1.txt
]0;hindle1@st-francis: /tmp/sun/proj1hindle1@st-francis:/tmp/sun/proj1$ git aadd *.txt
]0;hindle1@st-francis: /tmp/sun/proj1hindle1@st-francis:/tmp/sun/proj1$ git commit -0aam 'add files'
[master (root-commit) 4360502] add files
 3 files changed, 897 insertions(+)
 create mode 100644 proj1.1.txt
 create mode 100644 proj1.2.txt
 create mode 100644 proj1.txt
]0;hindle1@st-francis: /tmp/sun/proj1hindle1@st-francis:/tmp/sun/proj1$ head proj1.txt > proj1.txt 
]0;hindle1@st-francis: /tmp/sun/proj1hindle1@st-francis:/tmp/sun/proj1$ git commit -am 'trnuncate'
[master edf39f0] truncate
 1 file changed, 117 deletions(-)
 rewrite proj1.txt (100%)
]0;hindle1@st-francis: /tmp/sun/proj1hindle1@st-francis:/tmp/sun/proj1$ sort proj1.2.txt > proj1.2.txt 
]0;hindle1@st-francis: /tmp/sun/proj1hindle1@st-francis:/tmp/sun/proj1$ sort proj1.2.txt > proj1.2.txt git commit -am 'truncate'''''''''s'o'r't'
[master 51b7271] sort
 1 file changed, 710 deletions(-)
 rewrite proj1.2.txt (100%)
]0;hindle1@st-francis: /tmp/sun/proj1hindle1@st-francis:/tmp/sun/proj1$ git commit -am 'sort'sort proj1.2.txt > proj1.2.txt git commit -am 'sort'git commit -am 'sort'sort proj1.2.txt > proj1.2.txt [1@ [1@-[1@n
]0;hindle1@st-francis: /tmp/sun/proj1hindle1@st-francis:/tmp/sun/proj1$ sort -n proj1.2.txt > proj1.2.txt git commit -am 'sort'
# On branch master
nothing to commit (working directory clean)
]0;hindle1@st-francis: /tmp/sun/proj1hindle1@st-francis:/tmp/sun/proj1$ cd ..
]0;hindle1@st-francis: /tmp/sunhindle1@st-francis:/tmp/sun$ mkdir proj2
]0;hindle1@st-francis: /tmp/sunhindle1@st-francis:/tmp/sun$ cd proj2/
]0;hindle1@st-francis: /tmp/sun/proj2hindle1@st-francis:/tmp/sun/proj2$ git init
Initialized empty Git repository in /tmp/sun/proj2/.git/
]0;hindle1@st-francis: /tmp/sun/proj2hindle1@st-francis:/tmp/sun/proj2$ giutt mkdir t1
]0;hindle1@st-francis: /tmp/sun/proj2hindle1@st-francis:/tmp/sun/proj2$ cd mkdir t2
]0;hindle1@st-francis: /tmp/sun/proj2hindle1@st-francis:/tmp/sun/proj2$ mkdir t3
]0;hindle1@st-francis: /tmp/sun/proj2hindle1@st-francis:/tmp/sun/proj2$ toman ls > t1/1t1.txt
]0;hindle1@st-francis: /tmp/sun/proj2hindle1@st-francis:/tmp/sun/proj2$ man ls > t1/t1.txt[1@b[1@a[1@s[1@h.txt2.txt
]0;hindle1@st-francis: /tmp/sun/proj2hindle1@st-francis:/tmp/sun/proj2$ man bash > t1/t2.txt.txt3.txt[1@ [1@|[1@ [1@s[1@o[1@r[1@t/t3.txt3/t3.txt
]0;hindle1@st-francis: /tmp/sun/proj2hindle1@st-francis:/tmp/sun/proj2$ ls
t1  t2  t3
]0;hindle1@st-francis: /tmp/sun/proj2hindle1@st-francis:/tmp/sun/proj2$ git add */*
]0;hindle1@st-francis: /tmp/sun/proj2hindle1@st-francis:/tmp/sun/proj2$ git commit -am 'init'
[master (root-commit) 4d0fa8b] init
 3 files changed, 11161 insertions(+)
 create mode 100644 t1/t1.txt
 create mode 100644 t1/t2.txt
 create mode 100644 t3/t3.txt
]0;hindle1@st-francis: /tmp/sun/proj2hindle1@st-francis:/tmp/sun/proj2$ sort t1/t1.txt > t1//t21.txt 
]0;hindle1@st-francis: /tmp/sun/proj2hindle1@st-francis:/tmp/sun/proj2$ sort t1/t1.txt > t1/t1.txt goiit commit -am 'sorted'
[master d697636] sorted
 1 file changed, 243 deletions(-)
 rewrite t1/t1.txt (100%)
]0;hindle1@st-francis: /tmp/sun/proj2hindle1@st-francis:/tmp/sun/proj2$ git log
[?1h=
commit d697636d78e861edd7917b8bebe182cd1c0febbb
Author: Abram Hindle <abram.hindle@ualberta.ca>
Date:   Thu Jan 17 14:03:04 2013 -0700

    sorted

commit 4d0fa8b0c1231b826e9b6424f080986bec6aaaeb
Author: Abram Hindle <abram.hindle@ualberta.ca>
Date:   Thu Jan 17 14:02:47 2013 -0700

    init

[?1l>]0;hindle1@st-francis: /tmp/sun/proj2hindle1@st-francis:/tmp/sun/proj2$ cd ..
]0;hindle1@st-francis: /tmp/sunhindle1@st-francis:/tmp/sun$ cd proj2 
]0;hindle1@st-francis: /tmp/sun/proj2hindle1@st-francis:/tmp/sun/proj2$ git log
[?1h=
commit d697636d78e861edd7917b8bebe182cd1c0febbb
Author: Abram Hindle <abram.hindle@ualberta.ca>
Date:   Thu Jan 17 14:03:04 2013 -0700

    sorted

commit 4d0fa8b0c1231b826e9b6424f080986bec6aaaeb
Author: Abram Hindle <abram.hindle@ualberta.ca>
Date:   Thu Jan 17 14:02:47 2013 -0700

    init

[?1l>]0;hindle1@st-francis: /tmp/sun/proj2hindle1@st-francis:/tmp/sun/proj2$ cd ..
]0;hindle1@st-francis: /tmp/sunhindle1@st-francis:/tmp/sun$ cd proj1
]0;hindle1@st-francis: /tmp/sun/proj1hindle1@st-francis:/tmp/sun/proj1$ git log
[?1h=
commit 51b7271ec9f075b9d5ce4d2f7798b831ff2b88b4
Author: Abram Hindle <abram.hindle@ualberta.ca>
Date:   Thu Jan 17 14:01:36 2013 -0700

    sort

commit edf39f0c5d083383e2fa518f095265e44b734b7c
Author: Abram Hindle <abram.hindle@ualberta.ca>
Date:   Thu Jan 17 14:01:19 2013 -0700

    truncate

commit 4360502c32ca377f64f478e21421b5663372a8ed
Author: Abram Hindle <abram.hindle@ualberta.ca>
Date:   Thu Jan 17 14:01:04 2013 -0700

    add files

[?1l>]0;hindle1@st-francis: /tmp/sun/proj1hindle1@st-francis:/tmp/sun/proj1$ cd ..
]0;hindle1@st-francis: /tmp/sunhindle1@st-francis:/tmp/sun$ ls
proj1  proj2  typescript
]0;hindle1@st-francis: /tmp/sunhindle1@st-francis:/tmp/sun$ git clone proj1 proj1.prep
Cloning into 'proj1.prep'...
done.
]0;hindle1@st-francis: /tmp/sunhindle1@st-francis:/tmp/sun$ cd proj1p.prep/
]0;hindle1@st-francis: /tmp/sun/proj1.prephindle1@st-francis:/tmp/sun/proj1.prep$ ls
proj1.1.txt  proj1.2.txt  proj1.txt
]0;hindle1@st-francis: /tmp/sun/proj1.prephindle1@st-francis:/tmp/sun/proj1.prep$ mkdir proj1
]0;hindle1@st-francis: /tmp/sun/proj1.prephindle1@st-francis:/tmp/sun/proj1.prep$ git mv *.txt proj1
]0;hindle1@st-francis: /tmp/sun/proj1.prephindle1@st-francis:/tmp/sun/proj1.prep$ git status
# On branch master
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	renamed:    proj1.1.txt -> proj1/proj1.1.txt
#	renamed:    proj1.2.txt -> proj1/proj1.2.txt
#	renamed:    proj1.txt -> proj1/proj1.txt
#
]0;hindle1@st-francis: /tmp/sun/proj1.prephindle1@st-francis:/tmp/sun/proj1.prep$ git commit -am 'moved the sbase dir root to a subd 
ir'
[master a97babd] moved the root to a subdir
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename proj1.1.txt => proj1/proj1.1.txt (100%)
 rename proj1.2.txt => proj1/proj1.2.txt (100%)
 rename proj1.txt => proj1/proj1.txt (100%)
]0;hindle1@st-francis: /tmp/sun/proj1.prephindle1@st-francis:/tmp/sun/proj1.prep$ git log
[?1h=
commit a97babdd7bccd51851c2c0d288de852dc884384a
Author: Abram Hindle <abram.hindle@ualberta.ca>
Date:   Thu Jan 17 14:03:55 2013 -0700

    moved the root to a subdir

commit 51b7271ec9f075b9d5ce4d2f7798b831ff2b88b4
Author: Abram Hindle <abram.hindle@ualberta.ca>
Date:   Thu Jan 17 14:01:36 2013 -0700

    sort

commit edf39f0c5d083383e2fa518f095265e44b734b7c
Author: Abram Hindle <abram.hindle@ualberta.ca>
Date:   Thu Jan 17 14:01:19 2013 -0700

    truncate

commit 4360502c32ca377f64f478e21421b5663372a8ed
Author: Abram Hindle <abram.hindle@ualberta.ca>
Date:   Thu Jan 17 14:01:04 2013 -0700
:
[?1l>]0;hindle1@st-francis: /tmp/sun/proj1.prephindle1@st-francis:/tmp/sun/proj1.prep$ ls
proj1
]0;hindle1@st-francis: /tmp/sun/proj1.prephindle1@st-francis:/tmp/sun/proj1.prep$ cd ..
]0;hindle1@st-francis: /tmp/sunhindle1@st-francis:/tmp/sun$ ls
proj1  proj1.prep  proj2  typescript
]0;hindle1@st-francis: /tmp/sunhindle1@st-francis:/tmp/sun$ echo "nbow to merge into proj2"
now to merge into proj2
]0;hindle1@st-francis: /tmp/sunhindle1@st-francis:/tmp/sun$ cd proj2/
]0;hindle1@st-francis: /tmp/sun/proj2hindle1@st-francis:/tmp/sun/proj2$ ls
t1  t2  t3
]0;hindle1@st-francis: /tmp/sun/proj2hindle1@st-francis:/tmp/sun/proj2$ git mergepull ../proj2/ master
From ../proj2
 * branch            master     -> FETCH_HEAD
Already up-to-date.
]0;hindle1@st-francis: /tmp/sun/proj2hindle1@st-francis:/tmp/sun/proj2$ ls -l
total 12
drwxrwxr-x 2 hindle1 hindle1 4096 Jan 17 14:02 t1
drwxrwxr-x 2 hindle1 hindle1 4096 Jan 17 14:02 t2
drwxrwxr-x 2 hindle1 hindle1 4096 Jan 17 14:02 t3
]0;hindle1@st-francis: /tmp/sun/proj2hindle1@st-francis:/tmp/sun/proj2$ oop#oops
]0;hindle1@st-francis: /tmp/sun/proj2hindle1@st-francis:/tmp/sun/proj2$ #oopsls -lgit pull ../proj2/ master[1@1[1@.[1@p[1@r[1@e[1@pls -lgit branch
* master
]0;hindle1@st-francis: /tmp/sun/proj2hindle1@st-francis:/tmp/sun/proj2$ cd ../proj1,.prep/
]0;hindle1@st-francis: /tmp/sun/proj1.prephindle1@st-francis:/tmp/sun/proj1.prep$ git branch
* master
]0;hindle1@st-francis: /tmp/sun/proj1.prephindle1@st-francis:/tmp/sun/proj1.prep$ cd ..
]0;hindle1@st-francis: /tmp/sunhindle1@st-francis:/tmp/sun$ cd proj2/
]0;hindle1@st-francis: /tmp/sun/proj2hindle1@st-francis:/tmp/sun/proj2$ git pull ../proj1.prep/ master
warning: no common commits
remote: Counting objects: 12, done.
remote: Compressing objects:  10% (1/10)   
remote: Compressing objects:  20% (2/10)   
remote: Compressing objects:  30% (3/10)   
remote: Compressing objects:  40% (4/10)   
remote: Compressing objects:  50% (5/10)   
remote: Compressing objects:  60% (6/10)   
remote: Compressing objects:  70% (7/10)   
remote: Compressing objects:  80% (8/10)   
remote: Compressing objects:  90% (9/10)   
remote: Compressing objects: 100% (10/10)   
remote: Compressing objects: 100% (10/10), done.
remote: Total 12 (delta 1), reused 0 (delta 0)
Unpacking objects:   8% (1/12)   
Unpacking objects:  16% (2/12)   
Unpacking objects:  25% (3/12)   
Unpacking objects:  33% (4/12)   
Unpacking objects:  41% (5/12)   
Unpacking objects:  50% (6/12)   
Unpacking objects:  58% (7/12)   
Unpacking objects:  66% (8/12)   
Unpacking objects:  75% (9/12)   
Unpacking objects:  83% (10/12)   
Unpacking objects:  91% (11/12)   
Unpacking objects: 100% (12/12)   
Unpacking objects: 100% (12/12), done.
From ../proj1.prep
 * branch            master     -> FETCH_HEAD
Merge made by the 'recursive' strategy.
 proj1/proj1.1.txt |   70 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 proj1/proj1.1.txt
 create mode 100644 proj1/proj1.2.txt
 create mode 100644 proj1/proj1.txt
]0;hindle1@st-francis: /tmp/sun/proj2hindle1@st-francis:/tmp/sun/proj2$ ls -l
total 16
drwxrwxr-x 2 hindle1 hindle1 4096 Jan 17 14:05 proj1
drwxrwxr-x 2 hindle1 hindle1 4096 Jan 17 14:02 t1
drwxrwxr-x 2 hindle1 hindle1 4096 Jan 17 14:02 t2
drwxrwxr-x 2 hindle1 hindle1 4096 Jan 17 14:02 t3
]0;hindle1@st-francis: /tmp/sun/proj2hindle1@st-francis:/tmp/sun/proj2$ ls -l proj1/
total 4
-rw-rw-r-- 1 hindle1 hindle1 2278 Jan 17 14:05 proj1.1.txt
-rw-rw-r-- 1 hindle1 hindle1    0 Jan 17 14:05 proj1.2.txt
-rw-rw-r-- 1 hindle1 hindle1    0 Jan 17 14:05 proj1.txt
]0;hindle1@st-francis: /tmp/sun/proj2hindle1@st-francis:/tmp/sun/proj2$ git log
[?1h=
commit d9e3b6cc84a24bc572b3b6534b21b3f5f82eea1c
Merge: d697636 a97babd
Author: Abram Hindle <abram.hindle@ualberta.ca>
Date:   Thu Jan 17 14:05:14 2013 -0700

    Merge branch 'master' of ../proj1.prep

commit a97babdd7bccd51851c2c0d288de852dc884384a
Author: Abram Hindle <abram.hindle@ualberta.ca>
Date:   Thu Jan 17 14:03:55 2013 -0700

    moved the root to a subdir

commit d697636d78e861edd7917b8bebe182cd1c0febbb
Author: Abram Hindle <abram.hindle@ualberta.ca>
Date:   Thu Jan 17 14:03:04 2013 -0700

    sorted

commit 4d0fa8b0c1231b826e9b6424f080986bec6aaaeb
Author: Abram Hindle <abram.hindle@ualberta.ca>
:
[?1l>]0;hindle1@st-francis: /tmp/sun/proj2hindle1@st-francis:/tmp/sun/proj2$ git log --graph
[?1h=
*   commit d9e3b6cc84a24bc572b3b6534b21b3f5f82eea1c
|\  Merge: d697636 a97babd
| | Author: Abram Hindle <abram.hindle@ualberta.ca>
| | Date:   Thu Jan 17 14:05:14 2013 -0700
| | 
| |     Merge branch 'master' of ../proj1.prep
| |   
| * commit a97babdd7bccd51851c2c0d288de852dc884384a
| | Author: Abram Hindle <abram.hindle@ualberta.ca>
| | Date:   Thu Jan 17 14:03:55 2013 -0700
| | 
| |     moved the root to a subdir
| |   
| * commit 51b7271ec9f075b9d5ce4d2f7798b831ff2b88b4
| | Author: Abram Hindle <abram.hindle@ualberta.ca>
| | Date:   Thu Jan 17 14:01:36 2013 -0700
| | 
| |     sort
| |   
| * commit edf39f0c5d083383e2fa518f095265e44b734b7c
| | Author: Abram Hindle <abram.hindle@ualberta.ca>
:
 ESCESCOOBB
| | Date:   Thu Jan 17 14:01:19 2013 -0700
:
 ESCESCOOBB
| | 
:
 ESCESCOOBB
| |     truncate
:
 ESCESCOOBB
| |   
:
 ESCESCOOBB
| * commit 4360502c32ca377f64f478e21421b5663372a8ed
:
 ESCESCOOBB
|   Author: Abram Hindle <abram.hindle@ualberta.ca>
:
 ESCESCOOBB
|   Date:   Thu Jan 17 14:01:04 2013 -0700
:
 ESCESCOOBB
|   
:
 ESCESCOOBB
|       add files
:
 ESCESCOOBB
|  
:
 ESCESCOOBB
* commit d697636d78e861edd7917b8bebe182cd1c0febbb
:
 ESCESCOOBB
| Author: Abram Hindle <abram.hindle@ualberta.ca>
:
 ESCESCOOBB
| Date:   Thu Jan 17 14:03:04 2013 -0700
:
 ESCESCOOBB
| 
:
 ESCESCOOBB
|     sorted
:
 ESCESCOOBB
|  
:
 ESCESCOOBB
* commit 4d0fa8b0c1231b826e9b6424f080986bec6aaaeb
:
 ESCESCOOBB
  Author: Abram Hindle <abram.hindle@ualberta.ca>
:
 ESCESCOOBB
  Date:   Thu Jan 17 14:02:47 2013 -0700
:
 ESCESC[[66~~
  
      init
(END)
 ESCESC[[66~~

(END)
[?1l>]0;hindle1@st-francis: /tmp/sun/proj2hindle1@st-francis:/tmp/sun/proj2$ exit

Script done on Thu 17 Jan 2013 02:07:41 PM MST