| commit | db689dd0f9f92b1f41a0f473af3a5965c87accb7 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 10 Oct 2011 23:16:34 +0000 (10 16:16 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 10 Oct 2011 23:16:34 +0000 (10 16:16 -0700) | ||
| tree | 4b2dbead0950f14499c79465fa6950da7087892e | treesnapshot (tar.gz zip) |
| parent | 40d03c91bc5403bc02a837af8d57f4be027689ca | commitdiff |
| parent | 8b0e15fa95e11965f18c8d2585dc8ffd9bfc9356 | commitdiff |
Merge branch 'master' into next
* master:
Update draft release notes to 1.7.8
Fix some "variable might be used uninitialized" warnings
Makefile: fix permissions of mergetools/ checked out with permissive umask
Conflicts:
refs.c
This also fixes an earlier mismerge where I still had sort_ref_array() at
the end of get_ref_dir() which defeats the whole purpose of one of the
topic branches. get_loose_refs() asks get_ref_dir() to recursively fill
the ref array and sorts the result only once.
* master:
Update draft release notes to 1.7.8
Fix some "variable might be used uninitialized" warnings
Makefile: fix permissions of mergetools/ checked out with permissive umask
Conflicts:
refs.c
This also fixes an earlier mismerge where I still had sort_ref_array() at
the end of get_ref_dir() which defeats the whole purpose of one of the
topic branches. get_loose_refs() asks get_ref_dir() to recursively fill
the ref array and sorts the result only once.
| Makefile | diff1 | diff2 | blobhistory |
| builtin/revert.c | diff1 | diff2 | blobhistory |