| author | Sebastian Götte <jaseg@physik.tu-berlin.de> |
|---|---|
| Sun, 31 Mar 2013 16:02:24 +0000 (18:02 +0200) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Mon, 1 Apr 2013 02:23:59 +0000 (19:23 -0700) | |
| commit | efed002...492b81bf59d29193c4ffe96492dd9e9b |
| tree | 51a1696...d90213fc5746c590dbd49c4193d5b20d (tree) |
| parent | f8aae8d...efccd268babd482f10709b4f86a9f32e (diff) |
| Documentation/merge-options.txt | diff | blob | history | |
| builtin/merge.c | diff | blob | history | |
| git-pull.sh | diff | blob | history | |
| t/t7612-merge-verify-signatures.sh | [new file with mode: 0755] | blob |