| commit | 4d8c3258880548510b1d23f0db517adb7dfd2486 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 16 Nov 2009 00:41:02 +0000 (15 16:41 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 16 Nov 2009 00:41:02 +0000 (15 16:41 -0800) | ||
| tree | eeb42aefe5555624063221d7ddc28a29f598ce7f | treesnapshot (tar.gz zip) |
| parent | 9fa51ff940d41c7bbacf91b81d860d4c18b9ee1e | commitdiff |
| parent | a75d7b54097ef0d0945cbe673a9940d6c561f95c | commitdiff |
Merge branch 'fc/doc-fast-forward'
* fc/doc-fast-forward:
Use 'fast-forward' all over the place
Conflicts:
builtin-merge.c
* fc/doc-fast-forward:
Use 'fast-forward' all over the place
Conflicts:
builtin-merge.c