![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 19 Oct 2008 23:06:21 +0000 (16:06 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 19 Oct 2008 23:06:21 +0000 (16:06 -0700) | ||
| commit | 4f2d651e5b3414eac5d22ff47366d22c8cc289f6 | |
| tree | 1d6a6531fe0170679bfd193c4516e91c00cbb438 | tree | snapshot |
| parent | ce6e5ff435f325769dd28980cf3c8b1625f194f2 | commit | diff |
| parent | cf10f9fdd5e673a163847f0e931ce9731507e03b | commit | diff |
Merge branch 'mv/merge-noff'
* mv/merge-noff:
builtin-commit: use reduce_heads() only when appropriate
Conflicts:
builtin-commit.c
t/t7600-merge.sh
* mv/merge-noff:
builtin-commit: use reduce_heads() only when appropriate
Conflicts:
builtin-commit.c
t/t7600-merge.sh
| builtin-commit.c | diff1 | | diff2 | | blob | history |
| builtin-merge.c | diff1 | | diff2 | | blob | history |
| t/t7600-merge.sh | diff1 | | diff2 | | blob | history |