diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-09-03 00:10:08 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-03 00:10:08 (GMT) |
| commit | 106db883b791efb7f39f3b2f8553236ba792a89e (patch) | |
| tree | 4589463a8d7a3f2f42bfc1bb0ef72d0ad7c852a3 /Makefile | |
| parent | 7f314565fe20e324e8db1a7c233e43ca4e3683f0 (diff) | |
| parent | db3a95459cb873c302051b4b2b693be5ba248c13 (diff) | |
| download | git-106db883b791efb7f39f3b2f8553236ba792a89e.zip git-106db883b791efb7f39f3b2f8553236ba792a89e.tar.gz git-106db883b791efb7f39f3b2f8553236ba792a89e.tar.bz2 | |
Merge branch 'maint'
* maint:
Makefile: add merge_recursive.h to LIB_H
Improve documentation for --dirstat diff option
Bring local clone's origin URL in line with that of a remote clone
Documentation: minor cleanup in a use case in 'git stash' manual
Documentation: fix disappeared lines in 'git stash' manpage
Documentation: fix reference to a for-each-ref option
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -362,6 +362,7 @@ LIB_H += list-objects.h LIB_H += ll-merge.h LIB_H += log-tree.h LIB_H += mailmap.h +LIB_H += merge-recursive.h LIB_H += object.h LIB_H += pack.h LIB_H += pack-refs.h |