diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-01-17 22:39:49 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-17 22:39:49 -0800 |
| commit | 78f111e12de40e2d9aa8d0774acc287f79862b13 (patch) | |
| tree | 1c7f08c0e2ee31b86a2bfa1c010f5d7bddc3d0fb /Documentation/git-merge-index.txt | |
| parent | 8ee09acd8f3c96683ce2b81bb8ac8079f0e8a4fd (diff) | |
| parent | 3aed2fda6f8233895be0d1142c4c4b407fb692c3 (diff) | |
| download | git-78f111e12de40e2d9aa8d0774acc287f79862b13.tar.gz git-78f111e12de40e2d9aa8d0774acc287f79862b13.tar.xz | |
Merge branch 'maint-1.6.0' into maint
* maint-1.6.0:
builtin-fsck: fix off by one head count
Documentation: let asciidoc align related options
githooks.txt: add missing word
builtin-commit.c: do not remove COMMIT_EDITMSG
Diffstat (limited to 'Documentation/git-merge-index.txt')
0 files changed, 0 insertions, 0 deletions