diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-04-26 18:32:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-26 18:32:45 -0700 |
| commit | e7afa1115beb071512ac2b8d6b7487eadbfccc74 (patch) | |
| tree | e1473acf5c9da91c36ab64d8c941fe7bd632090e /Documentation/git-merge-index.txt | |
| parent | Merge branch 'master' into jc/cache-tree (diff) | |
| parent | t0000-basic: more commit-tree tests. (diff) | |
| download | tgif-e7afa1115beb071512ac2b8d6b7487eadbfccc74.tar.xz | |
Merge branch 'master' into jc/cache-tree
* master:
t0000-basic: more commit-tree tests.
commit-tree.c: check_valid() microoptimization.
Fix filename verification when in a subdirectory
rebase: typofix.
socksetup: don't return on set_reuse_addr() error
Diffstat (limited to 'Documentation/git-merge-index.txt')
0 files changed, 0 insertions, 0 deletions