diff options
| author |  Shawn O. Pearce <spearce@spearce.org> | 2007-10-19 01:18:55 -0400 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-10-19 01:18:55 -0400 |
| commit | f5bf6feb05b8c89c448ded6e6fad0eb58ef35463 (patch) | |
| tree | 9f166b46e5005a38d0aeb59a9b4880b508578688 /Documentation/git-merge-index.txt | |
| parent | Documentation/git-gc: improve description of --auto (diff) | |
| parent | Further 1.5.3.5 fixes described in release notes (diff) | |
| download | tgif-f5bf6feb05b8c89c448ded6e6fad0eb58ef35463.tar.xz | |
Merge branch 'maint'
* maint:
Further 1.5.3.5 fixes described in release notes
Avoid invoking diff drivers during git-stash
attr: fix segfault in gitattributes parsing code
Define NI_MAXSERV if not defined by operating system
Ensure we add directories in the correct order
Avoid scary errors about tagged trees/blobs during git-fetch
Diffstat (limited to 'Documentation/git-merge-index.txt')
0 files changed, 0 insertions, 0 deletions