diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-03-17 00:11:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-17 00:11:11 -0700 |
| commit | bb79a827a2bd4987b6def75a534635d75478cf4d (patch) | |
| tree | 404e17e248ecc23fbab685ff4151b08d0d411f82 /t/t6060-merge-index.sh | |
| parent | Git 1.8.2 (diff) | |
| parent | rev-parse: clarify documentation of $name@{upstream} syntax (diff) | |
| download | tgif-bb79a827a2bd4987b6def75a534635d75478cf4d.tar.xz | |
Merge branch 'maint'
* maint:
rev-parse: clarify documentation of $name@{upstream} syntax
sha1_name: pass object name length to diagnose_invalid_sha1_path()
Makefile: keep LIB_H entries together and sorted
Diffstat (limited to 't/t6060-merge-index.sh')
0 files changed, 0 insertions, 0 deletions