git.99rst.org
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0f64a5a
1e501a7
)
Merge branch 'maint'
author
Junio C Hamano
<redacted>
Mon, 21 Nov 2011 22:30:45 +0000
(14:30 -0800)
committer
Junio C Hamano
<redacted>
Mon, 21 Nov 2011 22:30:45 +0000
(14:30 -0800)
* maint:
documentation fix: git difftool uses diff tools, not merge tools.
Trivial merge
git clone https://git.99rst.org/PROJECT
git.99rst.org / git.git / commitdiff