diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-04-12 21:04:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-12 21:04:27 -0700 |
| commit | d016a896d4a58a53dbb98cd85ebd033771413079 (patch) | |
| tree | 0ac950f5bd9529ef1628246bfb14ae72bdfcb242 /Makefile | |
| parent | cd8d918601e28d3aa86b63eeea223b86d71ce1b6 (diff) | |
| parent | 55a643ed1b9b9af4d3bd9dc934dfccd142d1c632 (diff) | |
| download | git-d016a896d4a58a53dbb98cd85ebd033771413079.tar.gz git-d016a896d4a58a53dbb98cd85ebd033771413079.tar.xz | |
Merge branch 'jc/cherry'
* jc/cherry:
Documentation: --cherry-pick
git-log --cherry-pick A...B
Refactor patch-id filtering out of git-cherry and git-format-patch.
Add %m to '--pretty=format:'
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -283,7 +283,7 @@ LIB_H = \ diff.h object.h pack.h pkt-line.h quote.h refs.h list-objects.h sideband.h \ run-command.h strbuf.h tag.h tree.h git-compat-util.h revision.h \ tree-walk.h log-tree.h dir.h path-list.h unpack-trees.h builtin.h \ - utf8.h reflog-walk.h + utf8.h reflog-walk.h patch-ids.h DIFF_OBJS = \ diff.o diff-lib.o diffcore-break.o diffcore-order.o \ @@ -295,6 +295,7 @@ LIB_OBJS = \ date.o diff-delta.o entry.o exec_cmd.o ident.o \ interpolate.o \ lockfile.o \ + patch-ids.o \ object.o pack-check.o patch-delta.o path.o pkt-line.o sideband.o \ reachable.o reflog-walk.o \ quote.o read-cache.o refs.o run-command.o dir.o object-refs.o \ |