Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jc/logs' into next
author
Junio C Hamano
<junkio@cox.net>
Tue, 2 May 2006 06:16:35 +0000
(23:16 -0700)
committer
Junio C Hamano
<junkio@cox.net>
Tue, 2 May 2006 06:16:35 +0000
(23:16 -0700)
* jc/logs:
builtin-log/whatchanged/show: make them official.
1
2
Makefile
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
200f5df
7b763f7
)
diff --cc
Makefile
index b2b8b5d8a9cd101b9b0a256165a53a38457c77ad,5d19820a09ebafca1a8b73bcc76566685b8b7aca..ef1c36ea25c51b4af043269697bc18be5ada04be
---
1
/
Makefile
---
2
/
Makefile
+++ b/
Makefile
@@@
-167,8
-167,7
+167,8
@@@
PROGRAMS =
git-name-rev$X git-pack-redundant$X git-repo-config$X git-var$X \
git-describe$X git-merge-tree$X git-blame$X git-imap-send$X
- BUILT_INS = git-log$X \
-BUILT_INS = git-log$X git-whatchanged$X git-show$X
++BUILT_INS = git-log$X git-whatchanged$X git-show$X \
+ git-diff$X
# what 'all' will build and 'install' will install, in gitexecdir
ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)