Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jk/grep-binary-attribute' into maint
[gitweb.git]
/
Documentation
/
gitcore-tutorial.txt
diff --git
a/Documentation/gitcore-tutorial.txt
b/Documentation/gitcore-tutorial.txt
index c27d086f68432d094a0fa7c1f9da353d6d3a0513..fb0d5692a4d2e898da0dea9c346420467722badc 100644
(file)
--- a/
Documentation/gitcore-tutorial.txt
+++ b/
Documentation/gitcore-tutorial.txt
@@
-1004,7
+1004,7
@@
Updating from ae3a2da... to a80b4aa....
Fast-forward (no commit created; -m option ignored)
example | 1 +
hello | 1 +
- 2 files changed, 2 insertions(+)
, 0 deletions(-)
+ 2 files changed, 2 insertions(+)
----------------
Because your branch did not contain anything more than what had