diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-12-06 10:47:37 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-06 10:47:37 -0800 |
| commit | 2d13b732e3b2aca685615f353e3353e26cdbd9b3 (patch) | |
| tree | 88d4954398e0f775e787e091e9b03883a4decef3 /git-clone.sh | |
| parent | 4003a58e415e5f51a3becac0079505b72299a7bc (diff) | |
| parent | 49ed2bc4660c7cd0592cf21cc514080574d06320 (diff) | |
| download | git-2d13b732e3b2aca685615f353e3353e26cdbd9b3.tar.gz | |
Merge branch 'maint'
* maint:
git-reset to remove "$GIT_DIR/MERGE_MSG"
unpack-trees: make sure "df_conflict_entry.name" is NUL terminated.
Diffstat (limited to 'git-clone.sh')
0 files changed, 0 insertions, 0 deletions