Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'gp/maint-diffdoc'
author
Junio C Hamano
<gitster@pobox.com>
Fri, 2 Nov 2007 23:12:04 +0000
(16:12 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 2 Nov 2007 23:12:04 +0000
(16:12 -0700)
* gp/maint-diffdoc:
git-diff.txt: add section "output format" describing the diff formats
1
2
Documentation/git-diff.txt
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
3e4bb08
9e6c723
)
diff --cc
Documentation/git-diff.txt
Simple merge