summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Michael Hendricks <michael@ndrix.org>2007-07-04 19:11:36 -0600
committerLibravatar Junio C Hamano <gitster@pobox.com>2007-07-06 23:16:59 -0700
commitae740a588d581b34d2794a0993ae45cdca6d5ece (patch)
tree64d16859cdcd1e239bdc55a4e455f8d2599a0d96 /merge-recursive.c
parentcvsserver: always initialize state in argsplit() (diff)
downloadtgif-ae740a588d581b34d2794a0993ae45cdca6d5ece.tar.xz
git-send-email: allow an email alias for --from
Signed-off-by: Michael Hendricks <michael@ndrix.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions