diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-02-11 18:47:30 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-02-11 18:47:30 -0800 |
| commit | 30aa4fb15fa408596dea59cdc9f00c94eeaa69f1 (patch) | |
| tree | a52e476cf2c87ab65f06c567424a1859a7f52ee2 /git-merge-octopus.sh | |
| parent | filter-branch: Add more error-handling (diff) | |
| parent | Prepare for 1.6.1.4. (diff) | |
| download | tgif-30aa4fb15fa408596dea59cdc9f00c94eeaa69f1.tar.xz | |
Merge branch 'maint'
* maint:
Prepare for 1.6.1.4.
Make repack less likely to corrupt repository
fast-export: ensure we traverse commits in topological order
Clear the delta base cache if a pack is rebuilt
Conflicts:
RelNotes
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions