diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-10-20 16:51:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-10-20 16:51:05 -0700 |
| commit | 7a6a5e406297792075ca20a63427dd37ee4ecb01 (patch) | |
| tree | a00ae9e8db4de87e652ebb9c11a7970dd687af40 /Documentation/git-merge-one-file.txt | |
| parent | Merge branch 'maint' (diff) | |
| parent | Fix typo in show-index.c (diff) | |
| download | tgif-7a6a5e406297792075ca20a63427dd37ee4ecb01.tar.xz | |
Merge branch 'maint'
* maint:
Fix typo in show-index.c
pager: default to LESS=FRS
Diffstat (limited to 'Documentation/git-merge-one-file.txt')
0 files changed, 0 insertions, 0 deletions