diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-10-19 16:06:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-10-19 16:06:21 -0700 |
| commit | 4f2d651e5b3414eac5d22ff47366d22c8cc289f6 (patch) | |
| tree | 1d6a6531fe0170679bfd193c4516e91c00cbb438 /unpack-trees.c | |
| parent | Merge branch 'ns/rebase-noverify' (diff) | |
| parent | builtin-commit: use reduce_heads() only when appropriate (diff) | |
| download | tgif-4f2d651e5b3414eac5d22ff47366d22c8cc289f6.tar.xz | |
Merge branch 'mv/merge-noff'
* mv/merge-noff:
builtin-commit: use reduce_heads() only when appropriate
Conflicts:
builtin-commit.c
t/t7600-merge.sh
Diffstat (limited to 'unpack-trees.c')
0 files changed, 0 insertions, 0 deletions