diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-06-06 15:43:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-06-06 15:43:24 -0700 |
| commit | d44c782bbd6b0e806e056f9e8ff8cd8e426e67a3 (patch) | |
| tree | ca47f19971689badb2b644d038a72f4b0d9d8f13 /Documentation/git-merge.txt | |
| parent | f07dfbad29d473b35b5fecebf4baf77e32c7f97f (diff) | |
| parent | e2ac7cb5fbcf1407003aa07cdcd14141527ea2e3 (diff) | |
| download | git-d44c782bbd6b0e806e056f9e8ff8cd8e426e67a3.tar.gz | |
Merge branch 'sv/objfixes'
* sv/objfixes:
Don't assume tree entries that are not dirs are blobs
git-cvsimport: Make sure to use $git_dir always instead of .git sometimes
fix documentation of unpack-objects -n
Accept dates before 2000/01/01 when specified as seconds since the epoch
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions