20. 98ca9.. 34ac2.. f30ab..
commit commit commit
size size size
tree tree tree
0de24 184ca 92ec2
author parent parent
Scott 98ca9 34ac2
committer author author
Scott Scott Scott
committer committer
initial commit of my project Scott Scott
fixed bug #1328 - stack add feature #32 - ability to
overflow under certain add new formats to the central
snapshot A snapshot B snapshot C
21. 98ca9..
e8455..
commit size
blob size
0de24..
0de24..
tree 0de24
== LICENSE:
tree size
parent nil
(The MIT License)
author Scott blob e8455 README Copyright (c) 2007 Tom Preston-
committer Scott
tree 10af9 lib Permission is hereby granted, f
my commit message goes here ree of charge, to any person ob
and it is really, really cool
bc52a..
10af9..
blob size
tree size
require 'grit/index'
blob bc52a mylib.rb require 'grit/status'
tree b70f8 inc
module Grit
class << self
attr_accessor :debug
b70f8..
0ad1a..
tree size
size
blob
blob 0ad1a tricks.rb
require 'grit/git-ruby/reposi
require 'grit/git-ruby/file_i
module Grit
module Tricks
22. 98ca9..
e8455..
commit size
blob size
0de24..
0de24..
tree 0de24
== LICENSE:
tree size
parent nil
(The MIT License)
author Scott blob e8455 README Copyright (c) 2007 Tom Preston-
committer Scott
tree 10af9 lib Permission is hereby granted, f
my commit message goes here ree of charge, to any person ob
and it is really, really cool
bc52a..
10af9..
blob size
tree size
require 'grit/index'
blob bc52a mylib.rb require 'grit/status'
tree b70f8 inc
module Grit
class << self
attr_accessor :debug
b70f8..
0ad1a..
tree size
size
blob
blob 0ad1a tricks.rb
require 'grit/git-ruby/reposi
require 'grit/git-ruby/file_i
module Grit
module Tricks
96. commit 72d404debaa804fca82fd9cf710fbde48c7305c6
Author: Shawn O. Pearce <spearce@spearce.org>
Date: Sun Oct 12 13:13:59 2008 -0700
test-lib: fix broken printf
b8eecafd888d219633f4c29e8b6a90fc21a46dfd introduced usage of
printf without a format string.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
commit 969c877506cf8cc760c7b251fef6c5b6850bfc19
Author: Jeff King <peff@peff.net>
Date: Sun Oct 12 00:06:11 2008 -0400
git apply --directory broken for new files
We carefully verify that the input to git-apply is sane,
including cross-checking that the filenames we see in quot;+++quot;
headers match what was provided on the command line of quot;diff
--gitquot;. When --directory is used, however, we ended up
comparing the unadorned name to one with the prepended root,
causing us to complain about a mismatch.
We simply need to prepend the root directory, if any, when
pulling the name out of the git header.
commit ff74126c03a8dfd04e7533573a5c420f2a7112ac
Author: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Date: Fri Oct 10 13:42:12 2008 +0200
rebase -i: do not fail when there is no commit to cherry-pick
97. commit 72d404debaa804fca82fd9cf710fbde48c7305c6
C4 Author: Shawn O. Pearce <spearce@spearce.org>
Date: Sun Oct 12 13:13:59 2008 -0700
test-lib: fix broken printf
b8eecafd888d219633f4c29e8b6a90fc21a46dfd introduced usage of
printf without a format string.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
commit 969c877506cf8cc760c7b251fef6c5b6850bfc19
C3 Author: Jeff King <peff@peff.net>
Date: Sun Oct 12 00:06:11 2008 -0400
git apply --directory broken for new files
We carefully verify that the input to git-apply is sane,
including cross-checking that the filenames we see in quot;+++quot;
headers match what was provided on the command line of quot;diff
--gitquot;. When --directory is used, however, we ended up
comparing the unadorned name to one with the prepended root,
causing us to complain about a mismatch.
We simply need to prepend the root directory, if any, when
pulling the name out of the git header.
commit ff74126c03a8dfd04e7533573a5c420f2a7112ac
C2 Author: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Date: Fri Oct 10 13:42:12 2008 +0200
rebase -i: do not fail when there is no commit to cherry-pick
98. C7 C4
origin/master master HEAD
C6 C3
C5 C2
C1
git log
origin/master .. HEAD
C0
99. C7 C4
origin/master master HEAD
C6 C3
C5 C2
C1
git log
HEAD .. origin/master
C0
100. C7 C4
origin/master master HEAD
C6 C3
C5 C2
C1
git log
HEAD .. origin/master
C0
“commits in origin/master
not in HEAD”
129. master topic
what does topic have
$ git diff topic
C5 C3
that I don’t have?
C4 C2
C1
130. master topic
what would happen if I
$ git diff topic
C5 C3
merged in topic?
C4 C2
C1
131. master topic
how do I make topic
$ git diff topic
C5 C3
look like HEAD?
C4 C2
C1
132. $ git diff topic
diff --git a/test b/test
master topic
index 304313d..bd8c6c9 100644
--- a/test
+++ b/test
C5 C3 @@ -1,3 +1,3 @@
version one
-version two
-version three
C4 C2 +version four
+version five
C1
133. $ git diff topic
diff --git a/test b/test
master topic
index 304313d..bd8c6c9 100644
--- a/test
+++ b/test
C5 C3 @@ -1,3 +1,3 @@
version one
-version two
-version three
C4 C2 +version four
+version five
C1
134. $ git diff HEAD topic
diff --git a/test b/test
master topic
index bd8c6c9..304313d 100644
--- a/test
+++ b/test
C5 C3 @@ -1,3 +1,3 @@
version one
-version four
-version five
C4 C2 +version two
+version three
C1
135. $ git diff HEAD topic
diff --git a/test b/test
master topic
index bd8c6c9..304313d 100644
--- a/test
+++ b/test
C5 C3 @@ -1,3 +1,3 @@
version one
-version four
-version five
C4 C2 +version two
+version three
C1
142. $ git diff HEAD...topic
diff --git a/test b/test
master topic index 9bc69cf..304313d 100644
--- a/test
+++ b/test
@@ -1 +1,3 @@
C5 C3
version one
+version two
+version three
C4 C2
C1
143. $ git diff HEAD...topic
diff --git a/test b/test
master topic index 9bc69cf..304313d 100644
--- a/test
what would happen if I
+++ b/test
@@ -1 +1,3 @@
C5 C3
merged in topic?
version one
+version two
+version three
C4 C2
C1
216. pick 969c877 git apply --directory broken for new files
pick b75271d git diff <tree>{3,}: do not reverse order of args
pick 72d404d test-lib: fix broken printf
# Rebase f285a2d..5c283eb onto f285a2d
#
# Commands:
# p, pick = use commit
# e, edit = use commit, but stop for amending
# s, squash = use commit, but meld into previous commit
#
# If you remove a line here THAT COMMIT WILL BE LOST.
# However, if you remove everything, the rebase will be aborted.
#
~
~
~
~
~
quot;~/projects/git/.git/rebase-merge/git-rebase-todoquot; 14L, 472C
217. C2
pick 969c877 git apply --directory broken for new files
pick b75271d git diff <tree>{3,}: do not reverse order of args
C3
pick 72d404d test-lib: fix broken printf
C4
# Rebase f285a2d..5c283eb onto f285a2d
#
# Commands:
# p, pick = use commit
# e, edit = use commit, but stop for amending
# s, squash = use commit, but meld into previous commit
#
# If you remove a line here THAT COMMIT WILL BE LOST.
# However, if you remove everything, the rebase will be aborted.
#
~
~
~
~
~
quot;~/projects/git/.git/rebase-merge/git-rebase-todoquot; 14L, 472C
218. pick 969c877 git apply --directory broken for new files
pick b75271d git diff <tree>{3,}: do not reverse order of args
pick 72d404d test-lib: fix broken printf
# Rebase f285a2d..5c283eb onto f285a2d
#
# Commands:
# p, pick = use commit
# e, edit = use commit, but stop for amending
# s, squash = use commit, but meld into previous commit
#
# If you remove a line here THAT COMMIT WILL BE LOST.
# However, if you remove everything, the rebase will be aborted.
#
~
~
~
~
~
quot;~/projects/git/.git/rebase-merge/git-rebase-todoquot; 14L, 472C
219. pick 969c877 git apply --directory broken for new files
pick b75271d git diff <tree>{3,}: do not reverse order of args
pick 72d404d test-lib: fix broken printf
# Rebase f285a2d..5c283eb onto f285a2d
#
# Commands:
# p, pick = use commit
# e, edit = use commit, but stop for amending
# s, squash = use commit, but meld into previous commit
#
# If you remove a line here THAT COMMIT WILL BE LOST.
# However, if you remove everything, the rebase will be aborted.
#
~
~
~
~
~
quot;~/projects/git/.git/rebase-merge/git-rebase-todoquot; 14L, 472C
220. pick 969c877 git apply --directory broken for new files
pick b75271d git diff <tree>{3,}: do not reverse order of args
pick 72d404d test-lib: fix broken printf
# Rebase f285a2d..5c283eb onto f285a2d
#
# Commands:
# p, pick = use commit
# e, edit = use commit, but stop for amending
# s, squash = use commit, but meld into previous commit
#
# If you remove a line here THAT COMMIT WILL BE LOST.
# However, if you remove everything, the rebase will be aborted.
#
~
~
~
~
~
quot;~/projects/git/.git/rebase-merge/git-rebase-todoquot; 14L, 472C
221. pick 969c877 git apply --directory broken for new files
pick b75271d git diff <tree>{3,}: do not reverse order of args
pick 72d404d test-lib: fix broken printf
# Rebase f285a2d..5c283eb onto f285a2d
#
# Commands:
# p, pick = use commit
# e, edit = use commit, but stop for amending
# s, squash = use commit, but meld into previous commit
#
# If you remove a line here THAT COMMIT WILL BE LOST.
# However, if you remove everything, the rebase will be aborted.
#
~
~
~
~
~
quot;~/projects/git/.git/rebase-merge/git-rebase-todoquot; 14L, 472C
222. pick 969c877 git apply --directory broken for new files
pick b75271d git diff <tree>{3,}: do not reverse order of args
pick 72d404d test-lib: fix broken printf
# Rebase f285a2d..5c283eb onto f285a2d
#
# Commands:
# p, pick = use commit
# e, edit = use commit, but stop for amending
# s, squash = use commit, but meld into previous commit
#
# If you remove a line here THAT COMMIT WILL BE LOST.
# However, if you remove everything, the rebase will be aborted.
#
~
~
~
~
~
quot;~/projects/git/.git/rebase-merge/git-rebase-todoquot; 14L, 472C
223. edit 969c877 git apply --directory broken for new files
pick b75271d git diff <tree>{3,}: do not reverse order of args
pick 72d404d test-lib: fix broken printf
# Rebase f285a2d..5c283eb onto f285a2d
#
# Commands:
# p, pick = use commit
# e, edit = use commit, but stop for amending
# s, squash = use commit, but meld into previous commit
#
# If you remove a line here THAT COMMIT WILL BE LOST.
# However, if you remove everything, the rebase will be aborted.
#
~
~
~
~
~
quot;~/projects/git/.git/rebase-merge/git-rebase-todoquot; 14L, 472C
224. $ git rebase -i default~2^
Stopped at 969c877... git apply --directory broken for new files
You can amend the commit now, with
git commit --amend
Once you are satisfied with your changes, run
git rebase --continue
$_
225. $ git rebase -i default~2^
Stopped at 969c877... git apply --directory broken for new files
You can amend the commit now, with
git commit --amend
Once you are satisfied with your changes, run
git rebase --continue
$_
edit files
git add
git commit --amend
git rebase --continue
226. $ git rebase -i default~2^
Stopped at 969c877... git apply --directory broken for new files
You can amend the commit now, with
git commit --amend
Once you are satisfied with your changes, run
git rebase --continue
$_
edit files
git add
git commit --amend
git rebase --continue
227. $ git rebase -i default~2^
Stopped at 969c877... git apply --directory broken for new files
You can amend the commit now, with
git commit --amend
Once you are satisfied with your changes, run
git rebase --continue
$_
edit files
git add
git commit --amend
git rebase --continue
228. $ git rebase -i default~2^
Stopped at 969c877... git apply --directory broken for new files
You can amend the commit now, with
git commit --amend
Once you are satisfied with your changes, run
git rebase --continue
$_
edit files
git add
git commit --amend
git rebase --continue
233. pick 969c877 git apply --directory broken for new files
pick b75271d git diff <tree>{3,}: do not reverse order of args
pick 72d404d test-lib: fix broken printf
# Rebase f285a2d..5c283eb onto f285a2d
#
# Commands:
# p, pick = use commit
# e, edit = use commit, but stop for amending
# s, squash = use commit, but meld into previous commit
#
# If you remove a line here THAT COMMIT WILL BE LOST.
# However, if you remove everything, the rebase will be aborted.
#
~
~
~
~
~
quot;~/projects/git/.git/rebase-merge/git-rebase-todoquot; 14L, 472C
234. pick 969c877 git apply --directory broken for new files
squash b75271d git diff <tree>{3,}: do not reverse order of args
squash 72d404d test-lib: fix broken printf
# Rebase f285a2d..5c283eb onto f285a2d
#
# Commands:
# p, pick = use commit
# e, edit = use commit, but stop for amending
# s, squash = use commit, but meld into previous commit
#
# If you remove a line here THAT COMMIT WILL BE LOST.
# However, if you remove everything, the rebase will be aborted.
#
~
~
~
~
~
quot;~/projects/git/.git/rebase-merge/git-rebase-todoquot; 14L, 472C
235. # This is a combination of 3 commits.
# The first commit's message is:
git apply --directory broken for new files
# This is the 2nd commit message:
git diff <tree>{3,}: do not reverse order of args
# This is the 3rd commit message:
test-lib: fix broken printf
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# Author: Jeff King <peff@peff.net>
#
# Not currently on any branch.
# Changes to be committed:
# (use quot;git reset HEAD <file>...quot; to unstage)
#
# modified: builtin-apply.c
# modified: builtin-diff.c
# modified: t/t4013-diff-various.sh
# new file: t/t4013/diff.diff_master_master^_side
# modified: t/t4128-apply-root.sh
# modified: t/test-lib.sh
#
~
~
quot;.git/COMMIT_EDITMSGquot; 39L, 1454C
236. # This is a combination of 3 commits.
# The first commit's message is:
git apply --directory broken for new files
# This is the 2nd commit message:
git diff <tree>{3,}: do not reverse order of args
# This is the 3rd commit message:
test-lib: fix broken printf
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# Author: Jeff King <peff@peff.net>
#
# Not currently on any branch.
# Changes to be committed:
# (use quot;git reset HEAD <file>...quot; to unstage)
#
# modified: builtin-apply.c
# modified: builtin-diff.c
# modified: t/t4013-diff-various.sh
# new file: t/t4013/diff.diff_master_master^_side
# modified: t/t4128-apply-root.sh
# modified: t/test-lib.sh
#
~
~
quot;.git/COMMIT_EDITMSGquot; 39L, 1454C
237. # This is a combination of 3 commits.
# The first commit's message is:
git apply --directory broken for new files
# This is the 2nd commit message:
git diff <tree>{3,}: do not reverse order of args
# This is the 3rd commit message:
test-lib: fix broken printf
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# Author: Jeff King <peff@peff.net>
#
# Not currently on any branch.
# Changes to be committed:
# (use quot;git reset HEAD <file>...quot; to unstage)
#
# modified: builtin-apply.c
# modified: builtin-diff.c
# modified: t/t4013-diff-various.sh
# new file: t/t4013/diff.diff_master_master^_side
# modified: t/t4128-apply-root.sh
# modified: t/test-lib.sh
#
~
~
quot;.git/COMMIT_EDITMSGquot; 39L, 1454C
238. # This is a combination of 3 commits.
# The first commit's message is:
git apply --directory broken for new files
# This is the 2nd commit message:
git diff <tree>{3,}: do not reverse order of args
# This is the 3rd commit message:
test-lib: fix broken printf
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# Author: Jeff King <peff@peff.net>
#
# Not currently on any branch.
# Changes to be committed:
# (use quot;git reset HEAD <file>...quot; to unstage)
#
# modified: builtin-apply.c
# modified: builtin-diff.c
# modified: t/t4013-diff-various.sh
# new file: t/t4013/diff.diff_master_master^_side
# modified: t/t4128-apply-root.sh
# modified: t/test-lib.sh
#
~
~
quot;.git/COMMIT_EDITMSGquot; 39L, 1454C
267. $ git checkout master
$ ls
README rack_app.rb
$ git checkout rack_branch
$ ls
AUTHORS KNOWN-ISSUES Rakefile contrib lib
COPYING README
bin example test
268. $ git checkout master
$ ls
README rack_app.rb
$ git checkout rack_branch
$ ls
AUTHORS KNOWN-ISSUES Rakefile contrib lib
COPYING README
bin example test
269. $ git checkout master
$ ls
README rack_app.rb
$ git checkout rack_branch
$ ls
AUTHORS KNOWN-ISSUES Rakefile contrib lib
COPYING README
bin example test
270. $ git checkout master
$ ls
README rack_app.rb
$ git checkout rack_branch
$ ls
AUTHORS KNOWN-ISSUES Rakefile contrib lib
COPYING README
bin example test
300. $ git status
# On branch master
# Changed but not updated:
# (use quot;git add <file>...quot; to update what wi
# (use quot;git checkout -- <file>...quot; to discar
#
# modified: ticgit.gemspec
#
no changes added to commit (use quot;git addquot; and/
301. $ git status
# On branch master
# Changed but not updated:
# (use quot;git add <file>...quot; to update what wi
# (use quot;git checkout -- <file>...quot; to discar
#
# modified: ticgit.gemspec
#
no changes added to commit (use quot;git addquot; and/
309. $ git status
# On branch master
# Changes to be committed:
# (use quot;git reset HEAD <file>...quot; to unstage)
#
# modified: ticgit.gemspec
#
# Changed but not updated:
# (use quot;git add <file>...quot; to update what will be com
# (use quot;git checkout -- <file>...quot; to discard changes
#
# modified: ticgit.gemspec
#
310. $ git status
# On branch master
# Changes to be committed:
# (use quot;git reset HEAD <file>...quot; to unstage)
#
# modified: ticgit.gemspec
#
# Changed but not updated:
# (use quot;git add <file>...quot; to update what will be com
# (use quot;git checkout -- <file>...quot; to discard changes
#
# modified: ticgit.gemspec
#
311. $ git status
# On branch master
# Changes to be committed:
# (use quot;git reset HEAD <file>...quot; to unstage)
#
# modified: ticgit.gemspec
#
# Changed but not updated:
# (use quot;git add <file>...quot; to update what will be com
# (use quot;git checkout -- <file>...quot; to discard changes
#
# modified: ticgit.gemspec
#
312. $ git status
# On branch master
# Changes to be committed:
# (use quot;git reset HEAD <file>...quot; to unstage)
#
# modified: ticgit.gemspec
#
# Changed but not updated:
# (use quot;git add <file>...quot; to update what will be com
# (use quot;git checkout -- <file>...quot; to discard changes
#
# modified: ticgit.gemspec
#