diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-03-16 16:47:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-16 16:47:25 -0700 |
| commit | 5b8aac32fbf5be49e2cdfbdb082fa6bca9548d24 (patch) | |
| tree | 36d150c5b966cbfc9f06e6d2a67554e6aafb4a84 /diff.c | |
| parent | gitweb: highlight: replace tabs with spaces (diff) | |
| parent | merge: honor prepare-commit-msg hook (diff) | |
| download | git-5b8aac32fbf5be49e2cdfbdb082fa6bca9548d24.tar.gz git-5b8aac32fbf5be49e2cdfbdb082fa6bca9548d24.zip | |
Merge branch 'js/maint-merge-use-prepare-commit-msg-hook' into maint
* js/maint-merge-use-prepare-commit-msg-hook:
merge: honor prepare-commit-msg hook
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions