diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-03-05 12:49:02 -0500 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-03-05 12:50:29 -0500 |
| commit | 6b4318e604ca729d5d7508a744f0155555094fae (patch) | |
| tree | b8b65b5963737f9cd6663fc49fc6f902768b648a /Documentation/git-diff.txt | |
| parent | 5ced0572217f82f20c4a3460492768e07c08aeea (diff) | |
| parent | 2f6dc35d2ad0bd2a8648902a692f087f47d1ee86 (diff) | |
| download | git-6b4318e604ca729d5d7508a744f0155555094fae.tar.gz git-6b4318e604ca729d5d7508a744f0155555094fae.tar.xz | |
Merge branch 'maint'
* maint:
fast-import: Fail if a non-existant commit is used for merge
fast-import: Avoid infinite loop after reset
[sp: Minor evil merge to deal with type_names array moving
to be private in 'master'.]
Diffstat (limited to 'Documentation/git-diff.txt')
0 files changed, 0 insertions, 0 deletions