diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-16 01:41:02 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-16 01:41:02 +0100 |
| commit | 4d8c3258880548510b1d23f0db517adb7dfd2486 (patch) | |
| tree | eeb42aefe5555624063221d7ddc28a29f598ce7f /git-am.sh | |
| parent | Merge branch 'sc/difftool-p4merge' (diff) | |
| parent | Use 'fast-forward' all over the place (diff) | |
| download | git-4d8c3258880548510b1d23f0db517adb7dfd2486.tar.xz git-4d8c3258880548510b1d23f0db517adb7dfd2486.zip | |
Merge branch 'fc/doc-fast-forward'
* fc/doc-fast-forward:
Use 'fast-forward' all over the place
Conflicts:
builtin-merge.c
Diffstat (limited to 'git-am.sh')
0 files changed, 0 insertions, 0 deletions